commit 7da9c37a17745e0021e59467e55ee11976752603
author Bram Moolenaar <Bram@vim.org> Mon Apr 30 17:04:52 2012 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Apr 30 17:04:52 2012 +0200
tree 95748dea406e9bd05c5746f3982bb48c1bb24563
parent 9a7224b5a0639c26c843c10afcafa5bf149271fd

updated for version 7.3.511
Problem:    Using a FileReadCmd autocommand that does ":e! {file}" may cause a
            crash. (Christian Brabandt)
Solution:   Properly restore curwin->w_s.

src/fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 52eb34b..6fe1127 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8982,6 +8982,10 @@
 		    && buf_valid(aco->new_curbuf)
 		    && aco->new_curbuf->b_ml.ml_mfp != NULL)
 	    {
+# if defined(FEAT_SYN_HL) || defined(FEAT_SPELL)
+		if (curwin->w_s == &curbuf->b_s)
+		    curwin->w_s = &aco->new_curbuf->b_s;
+# endif
 		--curbuf->b_nwindows;
 		curbuf = aco->new_curbuf;
 		curwin->w_buffer = curbuf;