thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.884

Browse Source 
Problem:    Compiler warning for variable shadowing another. (John Little)
Solution:   Rename the variable. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2013-04-06 14:30:40 +02:00
parent 25a6df90df
commit 2a66a07b29
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/term.c
View File

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

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
884,
/**/ /**/
883, 883,
/**/ /**/