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)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index bb9a927..39f658a 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6835,7 +6835,11 @@
#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
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 194b3bf..ba8fde6 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6878,6 +6878,8 @@
# 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 @@
}
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). */
diff --git a/src/quickfix.c b/src/quickfix.c
index 40b6fe9..084d82e 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3425,6 +3425,9 @@
/* 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 @@
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);
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index c23e597..755ea74 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -2190,7 +2190,7 @@
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 @@
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
diff --git a/src/version.c b/src/version.c
index ab3185e..3dd0527 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 677,
+/**/
676,
/**/
675,