From: John Marriott Date: Thu, 8 Jan 2026 20:29:54 +0000 (+0000) Subject: patch 9.1.2067: shadow variable warning in menu.c X-Git-Tag: v9.1.2067^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4936e761a5da13fdb6fcc0bb1af075d6c473d6ae;p=thirdparty%2Fvim.git patch 9.1.2067: shadow variable warning in menu.c Problem: shadow variable warning in menu.c Solution: Rename the variable (John Marriott). closes: #19120 Signed-off-by: John Marriott Signed-off-by: Christian Brabandt --- diff --git a/src/menu.c b/src/menu.c index fc14e1b723..8b9b3af746 100644 --- a/src/menu.c +++ b/src/menu.c @@ -721,19 +721,19 @@ add_menu_path( if (tearpath != NULL) { char_u *s; - int idx; + int len; STRCPY(tearpath, menu_path); - idx = (int)(next_name - path_name - 1); - for (s = tearpath; *s && s < tearpath + idx; MB_PTR_ADV(s)) + len = (int)(next_name - path_name - 1); + for (s = tearpath; *s && s < tearpath + len; MB_PTR_ADV(s)) { if ((*s == '\\' || *s == Ctrl_V) && s[1]) { - ++idx; + ++len; ++s; } } - tearpath[idx] = NUL; + tearpath[len] = NUL; gui_add_tearoff(tearpath, pri_tab, pri_idx); vim_free(tearpath); } diff --git a/src/version.c b/src/version.c index 1f83c825f0..003b58ab07 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2067, /**/ 2066, /**/