summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-01 21:47:59 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-01 21:47:59 +0100
commita452b808b4da2d272ca4a50865eb8ca89a58f239 (patch)
tree2c899244df2dccba173cacc445c4a3fc8032c1b3
parentc478ee3d83fab0dba46740f2023c35f743f88316 (diff)
downloadvim-git-a452b808b4da2d272ca4a50865eb8ca89a58f239.tar.gz
patch 8.2.2077: build failure with small featuresv8.2.2077
Problem: Build failure with small features. Solution: Add #ifdef.
-rw-r--r--src/ex_docmd.c6
-rw-r--r--src/structs.h2
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e7aec5e2a..11e4bf5cc 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7994,12 +7994,14 @@ save_current_state(save_state_T *sst)
sst->save_finish_op = finish_op;
sst->save_opcount = opcount;
sst->save_reg_executing = reg_executing;
- sst->save_script_version = current_sctx.sc_version;
msg_scroll = FALSE; // no msg scrolling in Normal mode
restart_edit = 0; // don't go to Insert mode
p_im = FALSE; // don't use 'insertmode'
+#ifdef FEAT_EVAL
+ sst->save_script_version = current_sctx.sc_version;
current_sctx.sc_version = 1; // not in Vim9 script
+#endif
/*
* Save the current typeahead. This is required to allow using ":normal"
@@ -8023,7 +8025,9 @@ restore_current_state(save_state_T *sst)
opcount = sst->save_opcount;
reg_executing = sst->save_reg_executing;
msg_didout |= sst->save_msg_didout; // don't reset msg_didout now
+#ifdef FEAT_EVAL
current_sctx.sc_version = sst->save_script_version;
+#endif
// Restore the state (needed when called from a function executed for
// 'indentexpr'). Update the mouse and cursor, they may have changed.
diff --git a/src/structs.h b/src/structs.h
index b18134ac0..631881f5b 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4155,7 +4155,9 @@ typedef struct {
int save_finish_op;
int save_opcount;
int save_reg_executing;
+#ifdef FEAT_EVAL
int save_script_version;
+#endif
tasave_T tabuf;
} save_state_T;
diff --git a/src/version.c b/src/version.c
index 251782da2..9234d390b 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 */
/**/
+ 2077,
+/**/
2076,
/**/
2075,