summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-12-03 13:52:52 +0100
committerBram Moolenaar <Bram@vim.org>2015-12-03 13:52:52 +0100
commit20ad69ccfb60ef718bd26387ef0e5424461a643e (patch)
treebcb4f909cca8591ae40080c24a2c048e46957352
parent5311c02f25eed8f34e8a80becb98e86264f371c3 (diff)
downloadvim-git-20ad69ccfb60ef718bd26387ef0e5424461a643e.tar.gz
patch 7.4.948v7.4.948
Problem: Can't build when the insert_expand feature is disabled. Solution: Add #ifdefs. (Dan Pasanen, closes #499)
-rw-r--r--src/eval.c2
-rw-r--r--src/fileio.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index a2a99869e..7ec7364a7 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8748,7 +8748,9 @@ call_func(funcname, len, rettv, argcount, argvars, firstline, lastline,
* redo buffer.
*/
save_search_patterns();
+#ifdef FEAT_INS_EXPAND
if (!ins_compl_active())
+#endif
{
saveRedobuff();
did_save_redo = TRUE;
diff --git a/src/fileio.c b/src/fileio.c
index 20c029498..ded95b728 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -9450,7 +9450,9 @@ apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
if (!autocmd_busy)
{
save_search_patterns();
+#ifdef FEAT_INS_EXPAND
if (!ins_compl_active())
+#endif
{
saveRedobuff();
did_save_redobuff = TRUE;
diff --git a/src/version.c b/src/version.c
index a8526bf67..306f01c91 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 948,
+/**/
947,
/**/
946,