aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2015-11-24 10:23:36 -0600
committerDan Pasanen <dan.pasanen@gmail.com>2015-11-24 10:26:49 -0600
commitfe2f3cbb00b167a9270d6dec5f0a28813414f136 (patch)
treee42dd019859ac95ce0254dd9778c7b5ecfc42ca6
parent88127bc1896cc74aa005e46ccfe4c451ea0666d3 (diff)
downloadandroid_external_vim-fe2f3cbb00b167a9270d6dec5f0a28813414f136.tar.gz
android_external_vim-fe2f3cbb00b167a9270d6dec5f0a28813414f136.tar.bz2
android_external_vim-fe2f3cbb00b167a9270d6dec5f0a28813414f136.zip
Fix build with FEAT_INS_EXPAND disabled
* Fall back to the old behaviour since ins_compl_active won't exist without FEAT_INS_EXPAND Change-Id: I52fc08df176816e61839dd88f4acbb21408dcbac
-rw-r--r--src/eval.c4
-rw-r--r--src/fileio.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index e12813c23..d95321b1d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8741,11 +8741,15 @@ 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;
+#ifdef FEAT_INS_EXPAND
}
+#endif
++fp->uf_calls;
call_user_func(fp, argcount, argvars, rettv,
firstline, lastline,
diff --git a/src/fileio.c b/src/fileio.c
index 20c029498..3ad3ceaae 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -9450,11 +9450,15 @@ 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;
+#ifdef FEAT_INS_EXPAND
}
+#endif
did_filetype = keep_filetype;
}