Mercurial > vim

changeset 32840:a8561f9b47aa v9.0.1732

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1732: vimexpr: shadowing variable Commit: https://github.com/vim/vim/commit/d5475e8d8dc250f19043b730c10a01b06f1c8040 Author: Christian Brabandt <cb@256bit.org> Date: Thu Aug 17 23:34:09 2023 +0200 patch 9.0.1732: vimexpr: shadowing variable Problem: vimexpr: shadowing variable Solution: Rename local variable Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 17 Aug 2023 23:45:02 +0200
parents 0fe708288448
children f08bd477de70
files src/version.c src/vim9expr.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1732,
+/**/
     1731,
 /**/
     1730,
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -1100,9 +1100,9 @@ compile_call(
     if (!has_g_namespace && !is_autoload
 	    && compile_load(&p, namebuf + varlen, cctx, FALSE, FALSE) == OK)
     {
-	type_T	    *type = get_type_on_stack(cctx, 0);
-
-	res = generate_PCALL(cctx, argcount, namebuf, type, FALSE);
+	type_T	    *s_type = get_type_on_stack(cctx, 0);
+
+	res = generate_PCALL(cctx, argcount, namebuf, s_type, FALSE);
 	goto theend;
     }