Mercurial > vim
changeset 8362:a541dd5cfd3a v7.4.1473
commit https://github.com/vim/vim/commit/d1413d90983fc6c579ad66ba4d4611b057197f94
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Mar 2 21:51:56 2016 +0100
patch 7.4.1473
Problem: Can't build without the autocommand feature.
Solution: Add #ifdefs. (Yegappan Lakshmanan)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 02 Mar 2016 22:00:07 +0100 |
| parents | a446cc226a4d |
| children | f9879540d2b2 |
| files | src/edit.c src/main.c src/syntax.c src/version.c |
| diffstat | 4 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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");