diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-07-23 09:06:48 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-07-23 09:06:48 +0100 |
commit | 5fa9f23a63651a8abdb074b4fc2ec9b1adc6b089 (patch) | |
tree | ecfbc53cfa7bd322b2506a4b11909e234063272d | |
parent | b9e717367c395490149495cf375911b5d9de889e (diff) |
patch 9.0.0061: ml_get error with nested autocommandv9.0.0061
Problem: ml_get error with nested autocommand.
Solution: Also check line numbers for a nested autocommand. (closes #10761)
-rw-r--r-- | src/autocmd.c | 6 | ||||
-rw-r--r-- | src/proto/window.pro | 1 | ||||
-rw-r--r-- | src/testdir/test_autocmd.vim | 19 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/window.c | 39 |
5 files changed, 57 insertions, 10 deletions
diff --git a/src/autocmd.c b/src/autocmd.c index 841da14622..c376f20a23 100644 --- a/src/autocmd.c +++ b/src/autocmd.c @@ -2209,9 +2209,13 @@ apply_autocmds_group( ap->last = FALSE; ap->last = TRUE; + // Make sure cursor and topline are valid. The first time the current + // values are saved, restored by reset_lnums(). When nested only the + // values are corrected when needed. if (nesting == 1) - // make sure cursor and topline are valid check_lnums(TRUE); + else + check_lnums_nested(TRUE); save_did_emsg = did_emsg; diff --git a/src/proto/window.pro b/src/proto/window.pro index 9625942fea..8fa8661685 100644 --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -77,6 +77,7 @@ int tabline_height(void); int min_rows(void); int only_one_window(void); void check_lnums(int do_curwin); +void check_lnums_nested(int do_curwin); void reset_lnums(void); void make_snapshot(int idx); void restore_snapshot(int idx, int close_curwin); diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index e9a59c29a6..1202c058da 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2301,6 +2301,25 @@ func Test_autocmd_nested() call assert_fails('au WinNew * nested nested echo bad', 'E983:') endfunc +func Test_autocmd_nested_cursor_invalid() + set laststatus=0 + copen + cclose + call setline(1, ['foo', 'bar', 'baz']) + 3 + augroup nested_inv + autocmd User foo ++nested copen + autocmd BufAdd * let &laststatus = 2 - &laststatus + augroup END + doautocmd User foo + + augroup nested_inv + au! + augroup END + set laststatus& + bwipe! +endfunc + func Test_autocmd_once() " Without ++once WinNew triggers twice let g:did_split = 0 diff --git a/src/version.c b/src/version.c index b6e61f50ef..46d964312f 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 */ /**/ + 61, +/**/ 60, /**/ 59, diff --git a/src/window.c b/src/window.c index c91ebbcfe5..e7b44abd16 100644 --- a/src/window.c +++ b/src/window.c @@ -6770,12 +6770,10 @@ only_one_window(void) } /* - * Correct the cursor line number in other windows. Used after changing the - * current buffer, and before applying autocommands. - * When "do_curwin" is TRUE, also check current window. + * Implementation of check_lnums() and check_lnums_nested(). */ - void -check_lnums(int do_curwin) + static void +check_lnums_both(int do_curwin, int nested) { win_T *wp; tabpage_T *tp; @@ -6783,22 +6781,45 @@ check_lnums(int do_curwin) FOR_ALL_TAB_WINDOWS(tp, wp) if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf) { - // save the original cursor position and topline - wp->w_save_cursor.w_cursor_save = wp->w_cursor; - wp->w_save_cursor.w_topline_save = wp->w_topline; + if (!nested) + { + // save the original cursor position and topline + wp->w_save_cursor.w_cursor_save = wp->w_cursor; + wp->w_save_cursor.w_topline_save = wp->w_topline; + } if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count) 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; - // save the corrected cursor position and topline + // 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; } } /* + * Correct the cursor line number in other windows. Used after changing the + * current buffer, and before applying autocommands. + * When "do_curwin" is TRUE, also check current window. + */ + void +check_lnums(int do_curwin) +{ + check_lnums_both(do_curwin, FALSE); +} + +/* + * Like check_lnums() but for when check_lnums() was already called. + */ + void +check_lnums_nested(int do_curwin) +{ + check_lnums_both(do_curwin, TRUE); +} + +/* * Reset cursor and topline to its stored values from check_lnums(). * check_lnums() must have been called first! */ |