]> granicus.if.org Git - vim/commitdiff
patch 8.2.2976: build failure without the +eval feature v8.2.2976
authorBram Moolenaar <Bram@vim.org>
Fri, 11 Jun 2021 20:21:24 +0000 (22:21 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 11 Jun 2021 20:21:24 +0000 (22:21 +0200)
Problem:    Build failure without the +eval feature.
Solution:   Add #ifdefs.

src/scriptfile.c
src/version.c

index eefe39a13938cbd115b622e7422335c4c617af54..587aa29a0dfc0b05ceb8218b496b0eb789e917ce 100644 (file)
@@ -1119,6 +1119,7 @@ do_source(
     int                            save_debug_break_level = debug_break_level;
     int                            sid;
     scriptitem_T           *si = NULL;
+    int                            save_estack_compiling = estack_compiling;
 #endif
 #ifdef STARTUPTIME
     struct timeval         tv_rel;
@@ -1128,7 +1129,6 @@ do_source(
     proftime_T             wait_start;
 #endif
     int                            trigger_source_post = FALSE;
-    int                            save_estack_compiling = estack_compiling;
     ESTACK_CHECK_DECLARATION
 
     p = expand_env_save(fname);
@@ -1143,9 +1143,9 @@ do_source(
        smsg(_("Cannot source a directory: \"%s\""), fname);
        goto theend;
     }
+#ifdef FEAT_EVAL
     estack_compiling = FALSE;
 
-#ifdef FEAT_EVAL
     // See if we loaded this script before.
     for (sid = script_items.ga_len; sid > 0; --sid)
     {
@@ -1510,7 +1510,9 @@ almosttheend:
 
 theend:
     vim_free(fname_exp);
+#ifdef FEAT_EVAL
     estack_compiling = save_estack_compiling;
+#endif
     return retval;
 }
 
index 0a113f4326eb7f68cb72628a652763c38642d617..08f06cf4dc2926ff0dddf752c3f4fa6d266c936e 100644 (file)
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2976,
 /**/
     2975,
 /**/