summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-05-27 21:16:34 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-27 21:16:34 +0100
commit968443efb5a2a1ed7e1084f2aff65a95f2d0a17b (patch)
treee86ad2e3a6d5665856e0c57f021896fe13937e65
parentddf531292971f44e8545a3e097c0d8a11773eb38 (diff)
downloadvim-git-968443efb5a2a1ed7e1084f2aff65a95f2d0a17b.tar.gz
patch 8.2.5033: build error with +eval but without +quickfixv8.2.5033
Problem: Build error with +eval but without +quickfix. Warning for uninitialized variable. Solution: Adjust #ifdefs. (John Marriott)
-rw-r--r--src/autocmd.c3
-rw-r--r--src/errors.h4
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/autocmd.c b/src/autocmd.c
index 06cd02850..143891c9b 100644
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -2769,7 +2769,6 @@ autocmd_add_or_delete(typval_T *argvars, typval_T *rettv, int delete)
listitem_T *pli;
char_u *cmd = NULL;
char_u *end;
- char_u *p;
int once;
int nested;
int replace; // replace the cmd for a group/event
@@ -2937,6 +2936,8 @@ autocmd_add_or_delete(typval_T *argvars, typval_T *rettv, int delete)
}
else
{
+ char_u *p = NULL;
+
eli = NULL;
end = NULL;
while (TRUE)
diff --git a/src/errors.h b/src/errors.h
index 9bdc77d90..3e5252c76 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -1953,10 +1953,10 @@ EXTERN char e_eval_feature_not_available[]
#ifdef FEAT_QUICKFIX
EXTERN char e_no_location_list[]
INIT(= N_("E776: No location list"));
-# ifdef FEAT_EVAL
+#endif
+#ifdef FEAT_EVAL
EXTERN char e_string_or_list_expected[]
INIT(= N_("E777: String or List expected"));
-# endif
#endif
#ifdef FEAT_SPELL
EXTERN char e_this_does_not_look_like_sug_file_str[]
diff --git a/src/version.c b/src/version.c
index e6a048ce0..0d666a0a6 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 */
/**/
+ 5033,
+/**/
5032,
/**/
5031,