Mercurial > vim
changeset 7941:98644de08f15 v7.4.1266
commit https://github.com/vim/vim/commit/ab9fc7e0cf22bcee119b62d3433cac60f405e645
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 6 15:29:40 2016 +0100
patch 7.4.1266
Problem: A BufAdd autocommand may cause an ml_get error (Christian
Brabandt)
Solution: Increment RedrawingDisabled earlier.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 06 Feb 2016 15:30:04 +0100 |
| parents | 6705a339db38 |
| children | 5d117679edcd |
| files | src/ex_cmds.c src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3268,6 +3268,7 @@ do_ecmd( int did_get_winopts = FALSE; #endif int readfile_flags = 0; + int did_inc_redrawing_disabled = FALSE; if (eap != NULL) command = eap->do_ecmd_cmd; @@ -3600,6 +3601,11 @@ do_ecmd( oldbuf = (flags & ECMD_OLDBUF); } + /* Don't redraw until the cursor is in the right line, otherwise + * autocommands may cause ml_get errors. */ + ++RedrawingDisabled; + did_inc_redrawing_disabled = TRUE; + #ifdef FEAT_AUTOCMD buf = curbuf; #endif @@ -3697,9 +3703,6 @@ do_ecmd( /* * If we get here we are sure to start editing */ - /* don't redraw until the cursor is in the right line */ - ++RedrawingDisabled; - /* Assume success now */ retval = OK; @@ -3899,6 +3902,7 @@ do_ecmd( #endif --RedrawingDisabled; + did_inc_redrawing_disabled = FALSE; if (!skip_redraw) { n = p_so; @@ -3933,6 +3937,8 @@ do_ecmd( #endif theend: + if (did_inc_redrawing_disabled) + --RedrawingDisabled; #ifdef FEAT_AUTOCMD if (did_set_swapcommand) set_vim_var_string(VV_SWAPCOMMAND, NULL, -1);