From 664968d0b4b813134feff597aca2cf1a8d0a7f9c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 30 Apr 2012 17:04:52 +0200 Subject: 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 | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/fileio.c b/src/fileio.c index 52eb34b3..6fe11274 100644 --- 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 9352c700..b2f9a986 100644 --- 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, /**/ -- cgit v1.2.1