0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 9.0.0077: wrong restored cursor position when switching window in autocmd

Problem:    When switching window in autocmd the restored cursor position may
            be wrong.
Solution:   Do not restore the cursor if it was not set. (closes #10775)
This commit is contained in:
Bram Moolenaar
2022-07-26 13:47:13 +01:00
parent 92a1678d48
commit b03950fafa
4 changed files with 39 additions and 4 deletions

View File

@@ -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;
}
}