summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-26 12:23:04 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-26 12:23:04 +0200
commitc7488a7fc8ed0d4fd9cc440117ff848170321517 (patch)
tree010f457a887fcfc5faebf3e55d1cb0cb105654e8
parent1fd30d7bae1b3e57f008c052d765a3ec73d58114 (diff)
patch 8.1.2217: compiler warning for unused variablev8.1.2217
Problem: Compiler warning for unused variable. Solution: Move variable inside #ifdef. (John Marriott)
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 7153606282..fc692e3235 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3856,7 +3856,6 @@ do_sub(exarg_T *eap)
colnr_T matchcol;
colnr_T prev_matchcol = MAXCOL;
char_u *new_end, *new_start = NULL;
- colnr_T total_added = 0;
unsigned new_start_len = 0;
char_u *p1;
int did_sub = FALSE;
@@ -3868,6 +3867,7 @@ do_sub(exarg_T *eap)
linenr_T sub_firstlnum; /* nr of first sub line */
#ifdef FEAT_TEXT_PROP
int apc_flags = APC_SAVE_FOR_UNDO | APC_SUBSTITUTE;
+ colnr_T total_added = 0;
#endif
/*
diff --git a/src/version.c b/src/version.c
index c95f30583c..71d8959741 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2217,
+/**/
2216,
/**/
2215,