diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-08-28 19:16:15 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-08-28 19:16:15 +0100 |
commit | 670ab0334b536e12d84810de88e73b7bcb01346d (patch) | |
tree | 1e3bc0379d79097634aa84cd1e3db94069a92624 | |
parent | 2f892d8663498c21296ad6661dac1bb8372cfd10 (diff) | |
download | vim-git-670ab0334b536e12d84810de88e73b7bcb01346d.tar.gz |
patch 9.0.0304: WinScrolled is not triggered when only skipcol changesv9.0.0304
Problem: WinScrolled is not triggered when only skipcol changes.
Solution: Add w_last_skipcol and use it. (closes #10998)
-rw-r--r-- | src/autocmd.c | 1 | ||||
-rw-r--r-- | src/structs.h | 3 | ||||
-rw-r--r-- | src/testdir/test_autocmd.vim | 33 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/window.c | 2 |
5 files changed, 40 insertions, 1 deletions
diff --git a/src/autocmd.c b/src/autocmd.c index cc9d99d53..2e3026217 100644 --- a/src/autocmd.c +++ b/src/autocmd.c @@ -1249,6 +1249,7 @@ do_autocmd_event( { curwin->w_last_topline = curwin->w_topline; curwin->w_last_leftcol = curwin->w_leftcol; + curwin->w_last_skipcol = curwin->w_skipcol; curwin->w_last_width = curwin->w_width; curwin->w_last_height = curwin->w_height; } diff --git a/src/structs.h b/src/structs.h index 091b886b2..490a973d2 100644 --- a/src/structs.h +++ b/src/structs.h @@ -3542,9 +3542,10 @@ struct window_S // window #endif - // four fields that are only used when there is a WinScrolled autocommand + // five fields that are only used when there is a WinScrolled autocommand linenr_T w_last_topline; // last known value for w_topline colnr_T w_last_leftcol; // last known value for w_leftcol + colnr_T w_last_skipcol; // last known value for w_skipcol int w_last_width; // last known value for w_width int w_last_height; // last known value for w_height diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 189a2bc46..a400b1dab 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -419,6 +419,39 @@ func Test_WinScrolled_close_curwin() call delete('Xtestout') endfunc +func Test_WinScrolled_long_wrapped() + CheckRunVimInTerminal + + let lines =<< trim END + set scrolloff=0 + let height = winheight(0) + let width = winwidth(0) + let g:scrolled = 0 + au WinScrolled * let g:scrolled += 1 + call setline(1, repeat('foo', height * width)) + call cursor(1, height * width) + END + call writefile(lines, 'Xtest_winscrolled_long_wrapped') + let buf = RunVimInTerminal('-S Xtest_winscrolled_long_wrapped', {'rows': 6}) + + call term_sendkeys(buf, ":echo g:scrolled\<CR>") + call WaitForAssert({-> assert_match('^0 ', term_getline(buf, 6))}, 1000) + + call term_sendkeys(buf, 'gj') + call term_sendkeys(buf, ":echo g:scrolled\<CR>") + call WaitForAssert({-> assert_match('^1 ', term_getline(buf, 6))}, 1000) + + call term_sendkeys(buf, '0') + call term_sendkeys(buf, ":echo g:scrolled\<CR>") + call WaitForAssert({-> assert_match('^2 ', term_getline(buf, 6))}, 1000) + + call term_sendkeys(buf, '$') + call term_sendkeys(buf, ":echo g:scrolled\<CR>") + call WaitForAssert({-> assert_match('^3 ', term_getline(buf, 6))}, 1000) + + call delete('Xtest_winscrolled_long_wrapped') +endfunc + func Test_WinClosed() " Test that the pattern is matched against the closed window's ID, and both " <amatch> and <afile> are set to it. diff --git a/src/version.c b/src/version.c index bdc26b3af..3e1c7d308 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 304, +/**/ 303, /**/ 302, diff --git a/src/window.c b/src/window.c index 7c5c7ff69..9c4a19983 100644 --- a/src/window.c +++ b/src/window.c @@ -2806,6 +2806,7 @@ may_trigger_winscrolled(void) if (wp->w_last_topline != wp->w_topline || wp->w_last_leftcol != wp->w_leftcol + || wp->w_last_skipcol != wp->w_skipcol || wp->w_last_width != wp->w_width || wp->w_last_height != wp->w_height) { @@ -2820,6 +2821,7 @@ may_trigger_winscrolled(void) { wp->w_last_topline = wp->w_topline; wp->w_last_leftcol = wp->w_leftcol; + wp->w_last_skipcol = wp->w_skipcol; wp->w_last_width = wp->w_width; wp->w_last_height = wp->w_height; } |