Mercurial > vim

changeset 24876:c4ad84c7e15f v8.2.2976

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2976: build failure without the +eval feature Commit: https://github.com/vim/vim/commit/8de901e1f1b051e02a61ae76ad7c925e4c0642e5 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jun 11 22:21:24 2021 +0200 patch 8.2.2976: build failure without the +eval feature Problem: Build failure without the +eval feature. Solution: Add #ifdefs.
author Bram Moolenaar <Bram@vim.org>
date Fri, 11 Jun 2021 22:30:03 +0200
parents 14fda88ab35a
children efbb82e09bcb
files src/scriptfile.c src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -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;
 }
 
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2976,
+/**/
     2975,
 /**/
     2974,