diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-04-06 14:30:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-04-06 14:30:40 +0200 |
| commit | 2a66a07b29a636af54bc415626999202dd60a842 (patch) | |
| tree | c4822767340453a9d0533a6f1359db17ece9d5e8 | |
| parent | 25a6df90dfbed93963407e02f5e207abe2b2c68f (diff) | |
updated for version 7.3.884v7.3.884
Problem: Compiler warning for variable shadowing another. (John Little)
Solution: Rename the variable. (Christian Brabandt)
| -rw-r--r-- | src/term.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
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 @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 884, +/**/ 883, /**/ 882, |