From: Bram Moolenaar Date: Fri, 9 May 2014 18:33:04 +0000 (+0200) Subject: updated for version 7.4.283 X-Git-Tag: v7.4.283 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d442ec7fe2f929d098ee2739e3c98c70e3bf45a4;p=thirdparty%2Fvim.git updated for version 7.4.283 Problem: Compiler warning about unused variable. (Charles Cooper) Solution: Move the variable inside the #if block. --- diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 39f6791b64..f52e2abcd5 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1551,9 +1551,10 @@ make_filter_cmd(cmd, itmp, otmp) { char_u *buf; long_u len; - int is_fish_shell; #if (defined(UNIX) && !defined(ARCHIE)) || defined(OS2) + int is_fish_shell; + /* Account for fish's different syntax for subshells */ is_fish_shell = (fnamecmp(get_isolated_shell_name(), "fish") == 0); if (is_fish_shell) diff --git a/src/version.c b/src/version.c index fb0689bf8a..ae03814dfb 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 283, /**/ 282, /**/