Mercurial > vim
changeset 29505:33983b2f030f v9.0.0094
patch 9.0.0094: cursor restored unexpected with nested autocommand
Commit: https://github.com/vim/vim/commit/3d6ee8bda0550a01346f5992bbce09c0eb6d7569
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 27 15:23:35 2022 +0100
patch 9.0.0094: cursor restored unexpected with nested autocommand
Problem: Cursor restored unexpected with nested autocommand.
Solution: Do not restore the cursor when it was moved intentionally.
(closes #10780)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 27 Jul 2022 16:30:03 +0200 |
parents | 44ffb6bf2b55 |
children | f25ba0f8e43b |
files | src/testdir/test_autocmd.vim src/version.c src/window.c |
diffstat | 3 files changed, 26 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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,
--- a/src/window.c +++ b/src/window.c @@ -6781,6 +6781,8 @@ check_lnums_both(int do_curwin, int nest 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 nest 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) + if (need_adjust || !nested) + // save the (corrected) cursor position + wp->w_save_cursor.w_cursor_corr = wp->w_cursor; + + need_adjust = wp->w_topline > curbuf->b_ml.ml_line_count; + if (need_adjust) wp->w_topline = curbuf->b_ml.ml_line_count; - - // 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; + if (need_adjust || !nested) + // save the (corrected) topline + wp->w_save_cursor.w_topline_corr = wp->w_topline; } }