patch 7.4.948

Problem:    Can't build when the insert_expand feature is disabled.
Solution:   Add #ifdefs. (Dan Pasanen, closes #499)

diff --git a/src/eval.c b/src/eval.c
index a2a99869e601ba7dbea820076c24bca4239e6082..7ec7364a74e1da249e8b1923b6c94da1f2d13198 100644 (file)
--- 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 20c0294988a59b5964e8c860378117ba840fb120..ded95b728abc0a82c7162dd69734f9d0cae10855 100644 (file)
--- 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 a8526bf674d54b02d3284c913dbac08ef185c9d5..306f01c91bb79cd3c3e87fce483e2975eb60356b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    948,
 /**/
     947,
 /**/