updated for version 7.3.306
Problem: When closing a window there is a chance that deleting a scrollbar
triggers a GUI resize, which uses the window while it is not in a
valid state.
Solution: Set the buffer pointer to NULL to be able to detect the invalid
situation. Fix a few places that used the buffer pointer
incorrectly.
diff --git a/src/buffer.c b/src/buffer.c
index 24cbc06..81f6fde 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -416,6 +416,8 @@
#endif
buf_freeall(buf, (del_buf ? BFA_DEL : 0) + (wipe_buf ? BFA_WIPE : 0));
+ if (win_valid(win) && win->w_buffer == buf)
+ win->w_buffer = NULL; /* make sure we don't use the buffer now */
#ifdef FEAT_AUTOCMD
/* Autocommands may have deleted the buffer. */
@@ -560,6 +562,10 @@
#ifdef FEAT_DIFF
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 */
+#endif
#ifdef FEAT_FOLDING
/* No folds in an empty buffer. */
@@ -1346,6 +1352,10 @@
# endif
#endif
{
+#ifdef FEAT_SYN_HL
+ if (prevbuf == curwin->w_buffer)
+ reset_synblock(curwin);
+#endif
#ifdef FEAT_WINDOWS
if (unload)
close_windows(prevbuf, FALSE);
@@ -1395,10 +1405,6 @@
foldUpdateAll(curwin); /* update folds (later). */
#endif
-#ifdef FEAT_SYN_HL
- reset_synblock(curwin);
- curwin->w_s = &(buf->b_s);
-#endif
/* Get the buffer in the current window. */
curwin->w_buffer = buf;
curbuf = buf;
@@ -1409,6 +1415,10 @@
diff_buf_add(curbuf);
#endif
+#ifdef FEAT_SYN_HL
+ curwin->w_s = &(buf->b_s);
+#endif
+
/* Cursor on first line by default. */
curwin->w_cursor.lnum = 1;
curwin->w_cursor.col = 0;
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 9542113..36b0e52 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3619,10 +3619,6 @@
*/
check_arg_idx(curwin);
-#ifdef FEAT_SYN_HL
- reset_synblock(curwin); /* remove any ownsyntax */
-#endif
-
#ifdef FEAT_AUTOCMD
if (!auto_buf)
#endif
diff --git a/src/term.c b/src/term.c
index 77387e0..7798480 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3017,12 +3017,20 @@
if (width < 0 || height < 0) /* just checking... */
return;
- if (State == HITRETURN || State == SETWSIZE) /* postpone the resizing */
+ if (State == HITRETURN || State == SETWSIZE)
{
+ /* postpone the resizing */
State = SETWSIZE;
return;
}
+ /* curwin->w_buffer can be NULL when we are closing a window and the
+ * buffer has already been closed and removing a scrollbar causes a resize
+ * event. Don't resize then, it will happen after entering another buffer.
+ */
+ if (curwin->w_buffer == NULL)
+ return;
+
++busy;
#ifdef AMIGA
diff --git a/src/version.c b/src/version.c
index f21e332..74ed44d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 306,
+/**/
305,
/**/
304,
diff --git a/src/window.c b/src/window.c
index b3a7f9e..6b803f5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1226,15 +1226,15 @@
}
newp->w_tagstackidx = oldp->w_tagstackidx;
newp->w_tagstacklen = oldp->w_tagstacklen;
-# ifdef FEAT_FOLDING
+#ifdef FEAT_FOLDING
copyFoldingState(oldp, newp);
-# endif
+#endif
win_init_some(newp, oldp);
-# ifdef FEAT_SYN_HL
+#ifdef FEAT_SYN_HL
check_colorcolumn(newp);
-# endif
+#endif
}
/*
@@ -2212,6 +2212,11 @@
out_flush();
#endif
+#ifdef FEAT_SYN_HL
+ /* Free independent synblock before the buffer is freed. */
+ reset_synblock(win);
+#endif
+
/*
* Close the link to the buffer.
*/
@@ -2222,7 +2227,8 @@
if (!win_valid(win) || last_window() || curtab != prev_curtab)
return;
- /* Free the memory used for the window. */
+ /* Free the memory used for the window and get the window that received
+ * the screen space. */
wp = win_free_mem(win, &dir, NULL);
/* Make sure curwin isn't invalid. It can cause severe trouble when
@@ -3247,6 +3253,9 @@
else
wp->w_farsi = W_CONV;
#endif
+#ifdef FEAT_SYN_HL
+ wp->w_s = &wp->w_buffer->b_s;
+#endif
}
/*
@@ -4437,7 +4446,6 @@
#endif /* FEAT_GUI */
#ifdef FEAT_SYN_HL
- reset_synblock(wp); /* free independent synblock */
vim_free(wp->w_p_cc_cols);
#endif
