# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1365251440 -7200
# Node ID 22adc26aaa9f701267bd1ee4636592859ee2dc70
# Parent  d215a237c1d5a4ae5ae32d929c550833e3b8b576
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
--- a/src/term.c
+++ b/src/term.c
@@ -4134,18 +4134,18 @@ check_termcode(max_offset, buf, bufsize,
 		/* 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
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    884,
+/**/
     883,
 /**/
     882,