Mercurial > vim

changeset 4267:22adc26aaa9f v7.3.884

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.884 Problem: Compiler warning for variable shadowing another. (John Little) Solution: Rename the variable. (Christian Brabandt)
author Bram Moolenaar <bram@vim.org>
date Sat, 06 Apr 2013 14:30:40 +0200
parents d215a237c1d5
children 03c33622c359
files src/term.c src/version.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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,