Skip to content

Commit 4936e76

Browse files
John Marriottchrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent a71e52a commit 4936e76

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/menu.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,19 +721,19 @@ add_menu_path(
721721
if (tearpath != NULL)
722722
{
723723
char_u *s;
724-
int idx;
724+
int len;
725725

726726
STRCPY(tearpath, menu_path);
727-
idx = (int)(next_name - path_name - 1);
728-
for (s = tearpath; *s && s < tearpath + idx; MB_PTR_ADV(s))
727+
len = (int)(next_name - path_name - 1);
728+
for (s = tearpath; *s && s < tearpath + len; MB_PTR_ADV(s))
729729
{
730730
if ((*s == '\\' || *s == Ctrl_V) && s[1])
731731
{
732-
++idx;
732+
++len;
733733
++s;
734734
}
735735
}
736-
tearpath[idx] = NUL;
736+
tearpath[len] = NUL;
737737
gui_add_tearoff(tearpath, pri_tab, pri_idx);
738738
vim_free(tearpath);
739739
}

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
2067,
737739
/**/
738740
2066,
739741
/**/

0 commit comments

Comments
 (0)