0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1473

Problem:    Can't build without the autocommand feature.
Solution:   Add #ifdefs. (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar
2016-03-02 21:51:56 +01:00
parent 4ca812b153
commit d1413d9098
4 changed files with 18 additions and 1 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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");

View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1473,
/**/
1472,
/**/