diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-11 22:21:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-11 22:21:24 +0200 |
| commit | 8de901e1f1b051e02a61ae76ad7c925e4c0642e5 (patch) | |
| tree | 1ebe44f545497a1dfe0b7942125b6a2ca0540af9 | |
| parent | f0a4069e3df904ac6bd57718ec06e56c5d7363e4 (diff) | |
| download | vim-git-8de901e1f1b051e02a61ae76ad7c925e4c0642e5.tar.gz | |
patch 8.2.2976: build failure without the +eval featurev8.2.2976
Problem: Build failure without the +eval feature.
Solution: Add #ifdefs.
| -rw-r--r-- | src/scriptfile.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c index eefe39a13..587aa29a0 100644 --- 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; } diff --git a/src/version.c b/src/version.c index 0a113f432..08f06cf4d 100644 --- 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, |