From 1814183b865059679f6ee526ec23fc575e536e66 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 25 Jun 2017 21:17:25 +0200 Subject: 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) --- src/ex_cmds.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ex_cmds.c') diff --git a/src/ex_cmds.c b/src/ex_cmds.c index bb9a92776..39f658a6e 100644 --- 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 -- cgit v1.2.1