summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-12 20:01:11 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-12 20:01:11 +0200
commit2196bce56fcd56b0eaece50c079bac99f5bc31af (patch)
tree76692bdf6fb014750bd8651aaaca356e0d38ab1f
parenta80faa8930ed5a554beeb2727762538873135e83 (diff)
downloadvim-git-8.2.0560.tar.gz
patch 8.2.0560: compiler warning in tiny buildv8.2.0560
Problem: Compiler warning in tiny build. Solution: Move declaration inside #ifdef. (Dominique Pelle, closes #5915)
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d979f43ef..1cc231dee 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -647,9 +647,9 @@ do_cmdline(
# define cmd_cookie cookie
#endif
static int call_depth = 0; // recursiveness
+#ifdef FEAT_EVAL
ESTACK_CHECK_DECLARATION
-#ifdef FEAT_EVAL
// For every pair of do_cmdline()/do_one_cmd() calls, use an extra memory
// location for storing error messages to be converted to an exception.
// This ensures that the do_errthrow() call in do_one_cmd() does not
@@ -1295,7 +1295,7 @@ do_cmdline(
/*
* On an interrupt or an aborting error not converted to an exception,
* disable the conversion of errors to exceptions. (Interrupts are not
- * converted any more, here.) This enables also the interrupt message
+ * converted anymore, here.) This enables also the interrupt message
* when force_abort is set and did_emsg unset in case of an interrupt
* from a finally clause after an error.
*/
diff --git a/src/version.c b/src/version.c
index f9d8a5a82..3ef50fb7e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 560,
+/**/
559,
/**/
558,