aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/buffer.c7
-rw-r--r--src/nvim/version.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 3c416c157f..4a07884f98 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -627,10 +627,11 @@ void buf_freeall(buf_T *buf, int flags)
*/
if (buf == curbuf && !is_curbuf)
return;
- diff_buf_delete(buf); /* Can't use 'diff' for unloaded buffer. */
- /* Remove any ownsyntax, unless exiting. */
- if (firstwin != NULL && curwin->w_buffer == buf)
+ diff_buf_delete(buf); // Can't use 'diff' for unloaded buffer.
+ // Remove any ownsyntax, unless exiting.
+ if (curwin != NULL && curwin->w_buffer == buf) {
reset_synblock(curwin);
+ }
/* No folds in an empty buffer. */
FOR_ALL_TAB_WINDOWS(tp, win) {
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ee66b00b4e..c18439c279 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -111,7 +111,7 @@ static int included_patches[] = {
2333,
// 2332 NA
2331,
- // 2330,
+ 2330,
2329,
2328,
// 2327 NA