summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/buffer.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c
index d4a9c1eeb..5b2ec6871 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -567,8 +567,9 @@ buf_freeall(buf, flags)
diff_buf_delete(buf); /* Can't use 'diff' for unloaded buffer. */
#endif
#ifdef FEAT_SYN_HL
- if (curwin->w_buffer == buf)
- reset_synblock(curwin); /* remove any ownsyntax */
+ /* Remove any ownsyntax, unless exiting. */
+ if (firstwin != NULL && curwin->w_buffer == buf)
+ reset_synblock(curwin);
#endif
#ifdef FEAT_FOLDING
diff --git a/src/version.c b/src/version.c
index 1eadaec24..35b519885 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 361,
+/**/
360,
/**/
359,