From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 6 Apr 2013 12:30:40 +0000 (+0200)
Subject: updated for version 7.3.884
X-Git-Tag: v7.3.884
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a66a07b29a636af54bc415626999202dd60a842;p=thirdparty%2Fvim.git

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 438c159405..87e2e8b01c 100644
--- 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 b84c9f5a78..71a96b40a4 100644
--- 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,
 /**/