summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-28 16:14:30 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-28 16:14:30 +0200
commitfd249460fe600dba479bca03058e679bae6b5d52 (patch)
tree5403b3e12b2f2fe93759c51383ca7c78b544d861
parent8e85db0376604274bccf12bf5859d92b4192aca1 (diff)
patch 8.1.0217: compiler warning for variable set but not usedv8.1.0217
Problem: Compiler warning for variable set but not used. Solution: Move tilde_file inside #ifdef. (Hirohito Higashi, closes #3255)
-rw-r--r--src/ex_docmd.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 0094cdba7d..4c653ff5e6 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10654,9 +10654,9 @@ eval_vars(
int resultlen;
buf_T *buf;
int valid = VALID_HEAD + VALID_PATH; /* assume valid result */
- int tilde_file = FALSE;
int spec_idx;
#ifdef FEAT_MODIFY_FNAME
+ int tilde_file = FALSE;
int skip_mod = FALSE;
#endif
char_u strbuf[30];
@@ -10723,7 +10723,9 @@ eval_vars(
else
{
result = curbuf->b_fname;
+#ifdef FEAT_MODIFY_FNAME
tilde_file = STRCMP(result, "~") == 0;
+#endif
}
break;
@@ -10790,7 +10792,9 @@ eval_vars(
else
{
result = buf->b_fname;
+#ifdef FEAT_MODIFY_FNAME
tilde_file = STRCMP(result, "~") == 0;
+#endif
}
}
break;
diff --git a/src/version.c b/src/version.c
index 0d0a2b2866..dd9e1d4825 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 217,
+/**/
216,
/**/
215,