summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-02 21:51:56 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-02 21:51:56 +0100
commitd1413d90983fc6c579ad66ba4d4611b057197f94 (patch)
tree202502376399ed2bc098c6566019b4cee8046b46
parent4ca812b15378f83e56a2dc42947a61d0aa40697f (diff)
downloadvim-git-d1413d90983fc6c579ad66ba4d4611b057197f94.tar.gz
patch 7.4.1473v7.4.1473
Problem: Can't build without the autocommand feature. Solution: Add #ifdefs. (Yegappan Lakshmanan)
-rw-r--r--src/edit.c6
-rw-r--r--src/main.c9
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
4 files changed, 18 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index 626d3272c..abe26fbb6 100644
--- 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 4005f10ec..a7bc9e9a7 100644
--- 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 b385d1a70..e37dacb8f 100644
--- 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 8ed000bac..a48d5ba40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1473,
+/**/
1472,
/**/
1471,