aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.2976: build failure without the +eval feature

Browse Source 
Problem:    Build failure without the +eval feature.
Solution:   Add #ifdefs.
This commit is contained in:
Bram Moolenaar
2021-06-11 22:21:24 +02:00
parent f0a4069e3d
commit 8de901e1f1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scriptfile.c
View File

@@ -1119,6 +1119,7 @@ do_source(
int save_debug_break_level = debug_break_level; int save_debug_break_level = debug_break_level;
int sid; int sid;
scriptitem_T *si = NULL; scriptitem_T *si = NULL;
int save_estack_compiling = estack_compiling;
#endif #endif
#ifdef STARTUPTIME #ifdef STARTUPTIME
struct timeval tv_rel; struct timeval tv_rel;
@@ -1128,7 +1129,6 @@ do_source(
proftime_T wait_start; proftime_T wait_start;
#endif #endif
int trigger_source_post = FALSE; int trigger_source_post = FALSE;
int save_estack_compiling = estack_compiling;
ESTACK_CHECK_DECLARATION ESTACK_CHECK_DECLARATION
p = expand_env_save(fname); p = expand_env_save(fname);
@@ -1143,9 +1143,9 @@ do_source(
smsg(_("Cannot source a directory: \"%s\""), fname); smsg(_("Cannot source a directory: \"%s\""), fname);
goto theend; goto theend;
} }
#ifdef FEAT_EVAL
estack_compiling = FALSE; estack_compiling = FALSE;
#ifdef FEAT_EVAL
// See if we loaded this script before. // See if we loaded this script before.
for (sid = script_items.ga_len; sid > 0; --sid) for (sid = script_items.ga_len; sid > 0; --sid)
{ {
@@ -1510,7 +1510,9 @@ almosttheend:
theend: theend:
vim_free(fname_exp); vim_free(fname_exp);
#ifdef FEAT_EVAL
estack_compiling = save_estack_compiling; estack_compiling = save_estack_compiling;
#endif
return retval; return retval;
} }

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2976,
/**/ /**/
2975, 2975,
/**/ /**/