patch 7.4.1473

Problem:    Can't build without the autocommand feature.
Solution:   Add #ifdefs. (Yegappan Lakshmanan)

diff --git a/src/edit.c b/src/edit.c
index 626d3272c208a429d1f0eba77d3fccf008d781db..abe26fbb64b89ea6333f00b9ade33f25849e3420 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -1590,7 +1590,9 @@ ins_redraw(
                curwin->w_p_cole > 0
 # endif
                )
+# ifdef FEAT_AUTOCMD
        && !equalpos(last_cursormoved, curwin->w_cursor)
+# endif
 # ifdef FEAT_INS_EXPAND
        && !pum_visible()
 # endif
@@ -1616,12 +1618,16 @@ ins_redraw(
 # ifdef FEAT_CONCEAL
        if (curwin->w_p_cole > 0)
        {
+#  ifdef FEAT_AUTOCMD
            conceal_old_cursor_line = last_cursormoved.lnum;
+#  endif
            conceal_new_cursor_line = curwin->w_cursor.lnum;
            conceal_update_lines = TRUE;
        }
 # endif
+# ifdef FEAT_AUTOCMD
        last_cursormoved = curwin->w_cursor;
+# endif
     }
 #endif
 

diff --git a/src/main.c b/src/main.c
index 4005f10ec73c238f683afd78fdbcc1d011375a73..a7bc9e9a7983f9cbc8690423f5a60a7dd8c1beee 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1176,7 +1176,10 @@ main_loop(
                        curwin->w_p_cole > 0
 # endif
                        )
-                && !equalpos(last_cursormoved, curwin->w_cursor))
+# ifdef FEAT_AUTOCMD
+                && !equalpos(last_cursormoved, curwin->w_cursor)
+# endif
+                )
            {
 # ifdef FEAT_AUTOCMD
                if (has_cursormoved())
@@ -1186,12 +1189,16 @@ main_loop(
 # ifdef FEAT_CONCEAL
                if (curwin->w_p_cole > 0)
                {
+#  ifdef FEAT_AUTOCMD
                    conceal_old_cursor_line = last_cursormoved.lnum;
+#  endif
                    conceal_new_cursor_line = curwin->w_cursor.lnum;
                    conceal_update_lines = TRUE;
                }
 # endif
+# ifdef FEAT_AUTOCMD
                last_cursormoved = curwin->w_cursor;
+# endif
            }
 #endif
 

diff --git a/src/syntax.c b/src/syntax.c
index b385d1a70983c25580fc16274867ba2e435125f1..e37dacb8ffa7a89866a110b7a92a2c5f9a822129 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6342,9 +6342,11 @@ ex_ownsyntax(exarg_T *eap)
     if (old_value != NULL)
        old_value = vim_strsave(old_value);
 
+#ifdef FEAT_AUTOCMD
     /* Apply the "syntax" autocommand event, this finds and loads the syntax
      * file. */
     apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf);
+#endif
 
     /* move value of b:current_syntax to w:current_syntax */
     new_value = get_var_value((char_u *)"b:current_syntax");

diff --git a/src/version.c b/src/version.c
index 8ed000bac118186ca07d1876d0cc21177ea6c556..a48d5ba4034af35015cd7c9e3065f453a36cfb55 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1473,
 /**/
     1472,
 /**/