Mercurial > vim
changeset 11589:39787def24bb v8.0.0677
patch 8.0.0677: setting 'filetype' may switch buffers
commit https://github.com/vim/vim/commit/1814183b865059679f6ee526ec23fc575e536e66
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 25 21:17:25 2017 +0200
patch 8.0.0677: setting 'filetype' may switch buffers
Problem: Setting 'filetype' internally may cause the current buffer and
window to change unexpectedly.
Solution: Set curbuf_lock. (closes #1734)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 25 Jun 2017 21:30:04 +0200 |
| parents | 9ea6a69996fe |
| children | db5109d9c5da |
| files | src/ex_cmds.c src/ex_getln.c src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 5 files changed, 32 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -6835,7 +6835,11 @@ fix_help_buffer(void) #ifdef FEAT_AUTOCMD /* Set filetype to "help" if still needed. */ if (STRCMP(curbuf->b_p_ft, "help") != 0) + { + ++curbuf_lock; set_option_value((char_u *)"ft", 0L, (char_u *)"help", OPT_LOCAL); + --curbuf_lock; + } #endif #ifdef FEAT_SYN_HL
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -6878,6 +6878,8 @@ open_cmdwin(void) # ifdef FEAT_AUTOCMD /* Do execute autocommands for setting the filetype (load syntax). */ unblock_autocmds(); + /* But don't allow switching to another buffer. */ + ++curbuf_lock; # endif /* Showing the prompt may have set need_wait_return, reset it. */ @@ -6893,6 +6895,9 @@ open_cmdwin(void) } set_option_value((char_u *)"ft", 0L, (char_u *)"vim", OPT_LOCAL); } +# ifdef FEAT_AUTOCMD + --curbuf_lock; +# endif /* Reset 'textwidth' after setting 'filetype' (the Vim filetype plugin * sets 'textwidth' to 78). */
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -3425,6 +3425,9 @@ qf_fill_buffer(qf_info_T *qi, buf_T *buf /* Set the 'filetype' to "qf" each time after filling the buffer. * This resembles reading a file into a buffer, it's more logical when * using autocommands. */ +#ifdef FEAT_AUTOCMD + ++curbuf_lock; +#endif set_option_value((char_u *)"ft", 0L, (char_u *)"qf", OPT_LOCAL); curbuf->b_p_ma = FALSE; @@ -3435,6 +3438,7 @@ qf_fill_buffer(qf_info_T *qi, buf_T *buf apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL, FALSE, curbuf); keep_filetype = FALSE; + --curbuf_lock; #endif /* make sure it will be redrawn */ redraw_curbuf_later(NOT_VALID);
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -2190,7 +2190,7 @@ endfunc func Test_cclose_from_copen() augroup QF_Test au! - au FileType qf :cclose + au FileType qf :call assert_fails(':cclose', 'E788') augroup END copen augroup QF_Test @@ -2227,3 +2227,19 @@ func Test_Qf_Size() call XsizeTests('c') call XsizeTests('l') endfunc + +func Test_cclose_in_autocmd() + " Problem is only triggered if "starting" is zero, so that the OptionsSet + " event will be triggered. + call test_override('starting', 1) + augroup QF_Test + au! + au FileType qf :call assert_fails(':cclose', 'E788') + augroup END + copen + augroup QF_Test + au! + augroup END + augroup! QF_Test + call test_override('starting', 0) +endfunc