Mercurial > vim
changeset 32363:c114eebb5268 v9.0.1513
patch 9.0.1513: text scrolls unnecessarily when splitting
Commit: https://github.com/vim/vim/commit/b926bf47d61360a4ec5e4867714a08d70fd49965
Author: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat May 6 12:53:50 2023 +0100
patch 9.0.1513: text scrolls unnecessarily when splitting
Problem: Text scrolls unnecessarily when splitting and 'splitkeep' is not
"cursor".
Solution: Avoid resetting w_skipcol. (Luuk van Baal, closes #12334)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 06 May 2023 14:00:04 +0200 |
| parents | ab5eff34fb12 |
| children | 59a4760889c1 |
| files | src/testdir/dumps/Test_splitkeep_skipcol_1.dump src/testdir/test_window_cmd.vim src/version.c src/window.c |
| diffstat | 4 files changed, 36 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_splitkeep_skipcol_1.dump @@ -0,0 +1,12 @@ +|<+0#4040ff13#ffffff0@2|e+0#0000000&| |l|i|n|e| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |i|n| |o|n|e| |l|i|n|e| +|w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |i|n| |o|n|e| |l|i|n|e| |w|i|t|h| |l|o|t|s| +|o|f| |t|e|x|t| |i|n| |o|n|e| |l|i|n|e| @20 +|~+0#4040ff13&| @38 +|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @8|1|,|1|2|1| @9|A|l@1 +|<+0#4040ff13&@2|e+0#0000000&| |l|i|n|e| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |i|n| |o|n|e| |l|i|n|e| +>w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |i|n| |o|n|e| |l|i|n|e| |w|i|t|h| |l|o|t|s| +|o|f| |t|e|x|t| |i|n| |o|n|e| |l|i|n|e| @20 +|~+0#4040ff13&| @38 +|~| @38 +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @8|1|,|1|2|1| @9|A|l@1 +| +0&&@39
--- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1935,6 +1935,23 @@ func Test_splitkeep_status() call StopVimInTerminal(buf) endfunc +" skipcol is not reset unnecessarily and is copied to new window +func Test_splitkeep_skipcol() + CheckScreendump + + let lines =<< trim END + set splitkeep=topline smoothscroll splitbelow scrolloff=0 + call setline(1, 'with lots of text in one line '->repeat(6)) + norm 2 + wincmd s + END + + call writefile(lines, 'XTestSplitkeepSkipcol', 'D') + let buf = RunVimInTerminal('-S XTestSplitkeepSkipcol', #{rows: 12, cols: 40}) + + call VerifyScreenDump(buf, 'Test_splitkeep_skipcol_1', {}) +endfunc + func Test_new_help_window_on_error() help change.txt execute "normal! /CTRL-@\<CR>"
--- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1513, +/**/ 1512, /**/ 1511,
--- a/src/window.c +++ b/src/window.c @@ -1453,6 +1453,8 @@ win_init(win_T *newp, win_T *oldp, int f if (*p_spk != 'c') { + if (*p_spk == 't') + newp->w_skipcol = oldp->w_skipcol; newp->w_botline = oldp->w_botline; newp->w_prev_height = oldp->w_height - WINBAR_HEIGHT(oldp); newp->w_prev_winrow = oldp->w_winrow + 2 * WINBAR_HEIGHT(oldp); @@ -6860,14 +6862,16 @@ win_new_height(win_T *wp, int height) } wp->w_height = height; - wp->w_skipcol = 0; wp->w_redr_status = TRUE; win_comp_scroll(wp); // There is no point in adjusting the scroll position when exiting. Some // values might be invalid. if (!exiting && *p_spk == 'c') + { + wp->w_skipcol = 0; scroll_to_fraction(wp, prev_height); + } } void