summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-17 20:47:51 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-17 20:47:51 +0200
commit6e36b1c18e636549f3424546f2c20101604a2d33 (patch)
tree9672c2dba4278a78309ebd10e643d3744d3c9076
parent203ec7760d255d9f92950c8779ddfc587d7896e0 (diff)
downloadvim-git-6e36b1c18e636549f3424546f2c20101604a2d33.tar.gz
patch 8.2.1229: build error without the eval featurev8.2.1229
Problem: Build error without the eval feature. Solution: Declare starts_with_colon. Make function local.
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/proto/ex_docmd.pro1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index bb83eba87..91a51681a 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1649,7 +1649,7 @@ current_tab_nr(tabpage_T *tab)
return nr;
}
- int
+ static int
comment_start(char_u *p, int starts_with_colon UNUSED)
{
#ifdef FEAT_EVAL
@@ -1708,8 +1708,8 @@ do_one_cmd(
int save_reg_executing = reg_executing;
int ni; // set when Not Implemented
char_u *cmd;
+ int starts_with_colon = FALSE;
#ifdef FEAT_EVAL
- int starts_with_colon;
int starts_with_quote;
int vim9script = in_vim9script();
#endif
diff --git a/src/proto/ex_docmd.pro b/src/proto/ex_docmd.pro
index 4881c76af..85050313b 100644
--- a/src/proto/ex_docmd.pro
+++ b/src/proto/ex_docmd.pro
@@ -5,7 +5,6 @@ int do_cmdline(char_u *cmdline, char_u *(*fgetline)(int, void *, int, int), void
int getline_equal(char_u *(*fgetline)(int, void *, int, int), void *cookie, char_u *(*func)(int, void *, int, int));
void *getline_cookie(char_u *(*fgetline)(int, void *, int, int), void *cookie);
char_u *getline_peek(char_u *(*fgetline)(int, void *, int, int), void *cookie);
-int comment_start(char_u *p, int starts_with_colon);
int parse_command_modifiers(exarg_T *eap, char **errormsg, int skip_only);
void undo_cmdmod(exarg_T *eap, int save_msg_scroll);
int parse_cmd_address(exarg_T *eap, char **errormsg, int silent);
diff --git a/src/version.c b/src/version.c
index 388cd16d2..e43f4e399 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1229,
+/**/
1228,
/**/
1227,