patch 8.2.5033: build error with +eval but without +quickfix

Problem:    Build error with +eval but without +quickfix.  Warning for
            uninitialized variable.
Solution:   Adjust #ifdefs. (John Marriott)

diff --git a/src/autocmd.c b/src/autocmd.c
index 06cd02850187bb33e570599fe02aa4ae3a789d13..143891c9b89115df464e9b98edff899af6422b26 100644 (file)
--- 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 9bdc77d90d170707c6472b08767b1f7ac9fbad48..3e5252c76b4edf1634635c4a841a9417128ac82a 100644 (file)
--- 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 e6a048ce0e88025b50954a54806c156753c0ef6e..0d666a0a64ae075d46fb9acda4a03b3f8093ab36 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5033,
 /**/
     5032,
 /**/