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.

diff --git a/src/fileio.c b/src/fileio.c
index 52eb34b3bfd12fc63dc839fd4ad0d0f5dd26a5f2..6fe112745438f98b7c6d16befab5c74a3b11ab2b 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8982,6 +8982,10 @@ win_found:
                    && 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;

diff --git a/src/version.c b/src/version.c
index 9352c700928860ba624e6af48a8958b4f646f937..b2f9a986b284a4f882e4e4bf97e8b76dcae7413b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    511,
 /**/
     510,
 /**/