Mercurial > vim
diff src/window.c @ 29471:9ada26920941 v9.0.0077
patch 9.0.0077: wrong restored cursor position when switching window in autocmd
Commit: https://github.com/vim/vim/commit/b03950fafa07e8b8d975eeb345ad08b8b62e67ce
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jul 26 13:47:13 2022 +0100
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 26 Jul 2022 15:00:05 +0200 |
| parents | 87da4bab5aaa |
| children | 33983b2f030f |
line wrap: on
line diff
--- 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; } }