changeset 11643:db3ac953b942 v8.0.0704

patch 8.0.0704: problems with autocommands when opening help commit https://github.com/vim/vim/commit/163095f088a7c29710a16c75bb56229dd3b4116a Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 9 15:41:53 2017 +0200 patch 8.0.0704: problems with autocommands when opening help Problem: Problems with autocommands when opening help. Solution: Avoid using invalid "varp" value. Allow using :wincmd if buffer is locked. (closes #1806, closes #1804)
author Christian Brabandt <cb@256bit.org>
date Sun, 09 Jul 2017 15:45:03 +0200
parents 389cb40dda69
children da9c50ac8391
files src/ex_cmds.h src/option.c src/version.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -1625,7 +1625,7 @@ EX(CMD_winsize,		"winsize",	ex_winsize,
 			EXTRA|NEEDARG|TRLBAR,
 			ADDR_LINES),
 EX(CMD_wincmd,		"wincmd",	ex_wincmd,
-			NEEDARG|WORD1|RANGE|NOTADR,
+			NEEDARG|WORD1|RANGE|NOTADR|CMDWIN,
 			ADDR_WINDOWS),
 EX(CMD_windo,		"windo",	ex_listdo,
 			NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
--- a/src/option.c
+++ b/src/option.c
@@ -7570,6 +7570,9 @@ did_set_string_option(
 		did_filetype = TRUE;
 		apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft,
 					       curbuf->b_fname, TRUE, curbuf);
+		/* Just in case the old "curbuf" is now invalid. */
+		if (varp != &(curbuf->b_p_ft))
+		    varp = NULL;
 	    }
 	}
 #endif
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    704,
+/**/
     703,
 /**/
     702,