diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-07-27 15:23:35 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-07-27 15:23:35 +0100 |
commit | 3d6ee8bda0550a01346f5992bbce09c0eb6d7569 (patch) | |
tree | 1bc029d00d152ae32522ed705cc5da8cd6c190d4 /src | |
parent | 7abd1c6d8e777bde1700633bafc1a40be9e9c1aa (diff) |
patch 9.0.0094: cursor restored unexpected with nested autocommandv9.0.0094
Problem: Cursor restored unexpected with nested autocommand.
Solution: Do not restore the cursor when it was moved intentionally.
(closes #10780)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_autocmd.vim | 11 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/window.c | 19 |
3 files changed, 26 insertions, 6 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index f7763e6bd1..6bbe48c0f2 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2321,6 +2321,17 @@ func Test_autocmd_nested_cursor_invalid() bwipe! endfunc +func Test_autocmd_nested_keeps_cursor_pos() + enew + call setline(1, 'foo') + autocmd User foo ++nested normal! $a + autocmd InsertLeave * : + doautocmd User foo + call assert_equal([0, 1, 3, 0], getpos('.')) + + bwipe! +endfunc + func Test_autocmd_nested_switch_window() " run this in a separate Vim so that SafeState works CheckRunVimInTerminal diff --git a/src/version.c b/src/version.c index fde548bbb3..8232111feb 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 94, +/**/ 93, /**/ 92, diff --git a/src/window.c b/src/window.c index 83cc24e23f..6be736945b 100644 --- a/src/window.c +++ b/src/window.c @@ -6781,6 +6781,8 @@ check_lnums_both(int do_curwin, int nested) FOR_ALL_TAB_WINDOWS(tp, wp) if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf) { + int need_adjust; + if (!nested) { // save the original cursor position and topline @@ -6788,14 +6790,19 @@ check_lnums_both(int do_curwin, int nested) wp->w_save_cursor.w_topline_save = wp->w_topline; } - if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count) + need_adjust = wp->w_cursor.lnum > curbuf->b_ml.ml_line_count; + if (need_adjust) wp->w_cursor.lnum = curbuf->b_ml.ml_line_count; - if (wp->w_topline > curbuf->b_ml.ml_line_count) - wp->w_topline = curbuf->b_ml.ml_line_count; + if (need_adjust || !nested) + // save the (corrected) cursor position + wp->w_save_cursor.w_cursor_corr = wp->w_cursor; - // save the (corrected) cursor position and topline - wp->w_save_cursor.w_cursor_corr = wp->w_cursor; - wp->w_save_cursor.w_topline_corr = wp->w_topline; + need_adjust = wp->w_topline > curbuf->b_ml.ml_line_count; + if (need_adjust) + wp->w_topline = curbuf->b_ml.ml_line_count; + if (need_adjust || !nested) + // save the (corrected) topline + wp->w_save_cursor.w_topline_corr = wp->w_topline; } } |