summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-05-09 20:33:04 +0200
committerBram Moolenaar <Bram@vim.org>2014-05-09 20:33:04 +0200
commitd442ec7fe2f929d098ee2739e3c98c70e3bf45a4 (patch)
tree2ea0c3853c9b2e86ec23a4e5b0ad5eac50e4213f
parentb7547420a4fa576cfc6fb8b620bfc05ba8429f38 (diff)
updated for version 7.4.283v7.4.283
Problem: Compiler warning about unused variable. (Charles Cooper) Solution: Move the variable inside the #if block.
-rw-r--r--src/ex_cmds.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
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
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 283,
+/**/
282,
/**/
281,