Mercurial > vim
changeset 30439:e3091fc473a1 v9.0.0555
patch 9.0.0555: scrolling with 'nosplitscroll' in callback changing curwin
Commit: https://github.com/vim/vim/commit/20e58561abc4116f3bfbafaef242d886dd77b303
Author: Luuk van Baal <luukvbaal@gmail.com>
Date: Fri Sep 23 12:57:09 2022 +0100
patch 9.0.0555: scrolling with 'nosplitscroll' in callback changing curwin
Problem: Scrolling with 'nosplitscroll' in callback changing curwin.
Solution: Invalidate w_cline_row in the right place. (Luuk van Baal,
closes #11185)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 23 Sep 2022 14:00:06 +0200 |
parents | 69be14b8733c |
children | d03093a04b9a |
files | src/testdir/dumps/Test_nosplitscroll_callback_1.dump src/testdir/dumps/Test_nosplitscroll_callback_2.dump src/testdir/dumps/Test_nosplitscroll_callback_3.dump src/testdir/dumps/Test_nosplitscroll_callback_4.dump src/testdir/test_window_cmd.vim src/version.c src/window.c |
diffstat | 7 files changed, 68 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_nosplitscroll_callback_1.dump @@ -0,0 +1,8 @@ +|0+0&#ffffff0| @73 +|1| @73 +|2| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|T|o|p +>4+0&&| @73 +|5| @73 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|5|,|1| @11|6@1|% +| +0&&@74
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_nosplitscroll_callback_2.dump @@ -0,0 +1,8 @@ +>0+0&#ffffff0| @73 +|1| @73 +|2| @73 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|T|o|p +|4+0&&| @73 +|5| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|6@1|% +| +0&&@74
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_nosplitscroll_callback_3.dump @@ -0,0 +1,8 @@ +>1+0&#ffffff0| @73 +|2| @73 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1| @11|1|6|% +|4+0&&| @73 +|5| @73 +|6| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|6|,|1| @11|8|0|% +| +0&&@74
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_nosplitscroll_callback_4.dump @@ -0,0 +1,8 @@ +|1+0&#ffffff0| @73 +|2| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|8|,|1| @11|1|6|% +|4+0&&| @73 +>5| @73 +|6| @73 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|6|,|1| @11|8|0|% +| +0&&@74
--- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1,6 +1,7 @@ " Tests for window cmd (:wincmd, :split, :vsplit, :resize and etc...) source check.vim +source screendump.vim func Test_window_cmd_ls0_with_split() set ls=0 @@ -1817,4 +1818,34 @@ function Test_nosplitscroll_misc() set splitscroll& endfunc +function Test_nosplitscroll_callback() + CheckScreendump + let lines =<< trim END + set nosplitscroll + call setline(1, range(&lines)) + function WincmdCb(a, b) + split | wincmd p + endfunction + function TermCb(a, b) + close | split + endfunction + nnoremap t <cmd>call popup_create(term_start(&shell, { 'hidden': 1, 'exit_cb': 'TermCb' }), {})<CR> + nnoremap j <cmd>call job_start([&shell, &shellcmdflag, "echo"], { 'exit_cb': 'WincmdCb' })<CR> + END + call writefile(lines, 'XTestNosplitscrollCallback', 'D') + let buf = RunVimInTerminal('-S XTestNosplitscrollCallback', #{rows: 8}) + + call term_sendkeys(buf, "j") + call VerifyScreenDump(buf, 'Test_nosplitscroll_callback_1', {}) + + call term_sendkeys(buf, ":quit\<CR>Htexit\<CR>") + call VerifyScreenDump(buf, 'Test_nosplitscroll_callback_2', {}) + + call term_sendkeys(buf, ":set sb\<CR>:quit\<CR>Gj") + call VerifyScreenDump(buf, 'Test_nosplitscroll_callback_3', {}) + + call term_sendkeys(buf, ":quit\<CR>Gtexit\<CR>") + call VerifyScreenDump(buf, 'Test_nosplitscroll_callback_4', {}) +endfunc + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 555, +/**/ 554, /**/ 553,
--- a/src/window.c +++ b/src/window.c @@ -6360,7 +6360,7 @@ win_fix_scroll(int resize) win_T *wp; linenr_T lnum; - skip_update_topline = TRUE; // avoid scrolling in curs_rows() + skip_update_topline = TRUE; // avoid scrolling in curs_columns() FOR_ALL_WINDOWS(wp) { // Skip when window height has not changed. @@ -6378,6 +6378,8 @@ win_fix_scroll(int resize) scroll_to_fraction(wp, wp->w_prev_height); wp->w_cursor.lnum = lnum; } + else if (wp == curwin) + wp->w_valid &= ~VALID_CROW; invalidate_botline_win(wp); validate_botline_win(wp); }