summaryrefslogtreecommitdiff
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index e7b44abd1..83cc24e23 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6832,10 +6832,13 @@ reset_lnums()
FOR_ALL_TAB_WINDOWS(tp, wp)
if (wp->w_buffer == curbuf)
{
- // Restore the value if the autocommand didn't change it.
- if (EQUAL_POS(wp->w_save_cursor.w_cursor_corr, wp->w_cursor))
+ // Restore the value if the autocommand didn't change it and it was
+ // set.
+ if (EQUAL_POS(wp->w_save_cursor.w_cursor_corr, wp->w_cursor)
+ && wp->w_save_cursor.w_cursor_save.lnum != 0)
wp->w_cursor = wp->w_save_cursor.w_cursor_save;
- if (wp->w_save_cursor.w_topline_corr == wp->w_topline)
+ if (wp->w_save_cursor.w_topline_corr == wp->w_topline
+ && wp->w_save_cursor.w_topline_save != 0)
wp->w_topline = wp->w_save_cursor.w_topline_save;
}
}