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

patch 9.0.0094: cursor restored unexpected with nested autocommand

Browse Source 
Problem:    Cursor restored unexpected with nested autocommand.
Solution:   Do not restore the cursor when it was moved intentionally.
            (closes #10780)
This commit is contained in:
Bram Moolenaar
2022-07-27 15:23:35 +01:00
parent 7abd1c6d8e
commit 3d6ee8bda0
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/testdir/test_autocmd.vim
View File

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

2
src/version.c
View File

@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
94,
/**/
93,
/**/

19
src/window.c
View File

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