updated for version 7.3.884

Problem:    Compiler warning for variable shadowing another. (John Little)
Solution:   Rename the variable. (Christian Brabandt)

diff --git a/src/term.c b/src/term.c
index 438c15940531095761093ed5d4318476750f4d90..87e2e8b01c222dc4efe0b1e15223938de1719507 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -4134,18 +4134,18 @@ check_termcode(max_offset, buf, bufsize, buflen)
                /* eat it when it has 2 arguments and ends in 'R' */
                if (j == 1 && tp[i] == 'R')
                {
-                   char *p = NULL;
+                   char *aw = NULL;
 
                    u7_status = U7_GOT;
 # ifdef FEAT_AUTOCMD
                    did_cursorhold = TRUE;
 # endif
                    if (extra == 2)
-                       p = "single";
+                       aw = "single";
                    else if (extra == 3)
-                       p = "double";
-                   if (p != NULL)
-                       set_option_value((char_u *)"ambw", 0L, (char_u *)p, 0);
+                       aw = "double";
+                   if (aw != NULL)
+                       set_option_value((char_u *)"ambw", 0L, (char_u *)aw, 0);
                    key_name[0] = (int)KS_EXTRA;
                    key_name[1] = (int)KE_IGNORE;
                    slen = i + 1;

diff --git a/src/version.c b/src/version.c
index b84c9f5a78605d799b38da73216f5fd3b13aa838..71a96b40a49b46ec371ca5db8582a20901ceac49 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    884,
 /**/
     883,
 /**/