summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gui.c b/src/gui.c
index 8568d33ab..426cea92a 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -901,9 +901,10 @@ gui_update_cursor(force, clear_selection)
int attr;
attrentry_T *aep = NULL;
- /* Don't update the cursor when halfway busy scrolling.
- * ScreenLines[] isn't valid then. */
- if (!can_update_cursor)
+ /* Don't update the cursor when halfway busy scrolling or the screen size
+ * doesn't match 'columns' and 'lines. ScreenLines[] isn't valid then. */
+ if (!can_update_cursor || screen_Columns != gui.num_cols
+ || screen_Rows != gui.num_rows)
return;
gui_check_pos();
diff --git a/src/version.c b/src/version.c
index 0e703d10c..77d550fe8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 28,
+/**/
27,
/**/
26,