Mercurial > vim
changeset 32349:8323e235ff44 v9.0.1506
patch 9.0.1506: line number not displayed when using 'smoothscroll'
Commit: https://github.com/vim/vim/commit/88bb3e0a48f160134bdea98cd2b8bd3af86f9d6f
Author: zeertzjq <zeertzjq@outlook.com>
Date: Tue May 2 20:52:59 2023 +0100
patch 9.0.1506: line number not displayed when using 'smoothscroll'
Problem: Line number not displayed when using 'smoothscroll'.
Solution: Adjust condition for showing the line number. (closes https://github.com/vim/vim/issues/12333)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 02 May 2023 22:00:04 +0200 |
parents | 73c473159a74 |
children | f849791c1037 |
files | src/drawline.c src/testdir/dumps/Test_smooth_number_10.dump src/testdir/dumps/Test_smooth_number_7.dump src/testdir/dumps/Test_smooth_number_8.dump src/testdir/dumps/Test_smooth_number_9.dump src/testdir/test_scroll_opt.vim src/version.c |
diffstat | 7 files changed, 61 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -389,7 +389,7 @@ handle_lnum_col( // When there are text properties above the line put the line number // below them. if (wlv->row == lnum_row - && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow + && (wp->w_skipcol == 0 || wlv->row > 0 || (wp->w_p_nu && wp->w_p_rnu))) { long num;
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smooth_number_10.dump @@ -0,0 +1,12 @@ +|2+0#af5f00255#ffffff0|<+0#4040ff13&@2>o+0#0000000&|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e +| +0#af5f00255&@3|x+0#0000000&|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r +| +0#af5f00255&@3|y+0#0000000&| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g +| +0#af5f00255&@3| +0#0000000&|t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| +| +0#af5f00255&@1|1| |t+0#0000000&|h|r|e@1| @30 +|~+0#4040ff13&| @38 +|~| @38 +|~| @38 +|~| @38 +|~| @38 +|~| @38 +|-+0#0000000&@1|N|o|.@2|e|r|-@1| @10|2|,|3|7| @9|B|o|t|
--- a/src/testdir/dumps/Test_smooth_number_7.dump +++ b/src/testdir/dumps/Test_smooth_number_7.dump @@ -1,12 +1,12 @@ -|2+0#af5f00255#ffffff0|<+0#4040ff13&@2>o+0#0000000&|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e -| +0#af5f00255&@3|x+0#0000000&|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r -| +0#af5f00255&@3|y+0#0000000&| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g -| +0#af5f00255&@3| +0#0000000&|t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| |v|e|r|y| |l|o|n|g| |t|e|x|t| -| +0#af5f00255&@1|1| |t+0#0000000&|h|r|e@1| @30 -|~+0#4040ff13&| @38 -|~| @38 -|~| @38 -|~| @38 -|~| @38 -|~| @38 -|-+0#0000000&@1|N|o|.@2|e|r|-@1| @10|2|,|3|7| @9|B|o|t| +| +0#af5f00255#ffffff0@1|1| |o+0#0000000&|n|e| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o +| +0#af5f00255&@3|r+0#0000000&|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| @4 +|@+0#4040ff13&@2| @36 +|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @8|3|,|1| @11|T|o|p +| +0#af5f00255&@1|1| >o+0#0000000&|n|e| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o +| +0#af5f00255&@3|r+0#0000000&|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| @4 +| +0#af5f00255&@1|2| |t+0#0000000&|w|o| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o +|@+0#4040ff13&@2| @36 +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @8|1|,|1| @11|T|o|p +|:+0&&|b|o|t|r|i|g|h|t| |s|p| @27
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smooth_number_8.dump @@ -0,0 +1,12 @@ +| +0#af5f00255#ffffff0@1|1| |o+0#0000000&|n|e| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o +| +0#af5f00255&@3|r+0#0000000&|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| @4 +|@+0#4040ff13&@2| @36 +|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @8|3|,|1| @11|T|o|p +|<+0#4040ff13&@2| +0#af5f00255&|r+0#0000000&|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d> @4 +| +0#af5f00255&@1|2| |t+0#0000000&|w|o| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o +| +0#af5f00255&@3|n+0#0000000&|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| @34 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @8|1|,|1|0|4| @9|T|o|p +|:+0&&|b|o|t|r|i|g|h|t| |s|p| @27
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smooth_number_9.dump @@ -0,0 +1,12 @@ +| +0#af5f00255#ffffff0@1|1| |o+0#0000000&|n|e| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o +| +0#af5f00255&@3|r+0#0000000&|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| @4 +|@+0#4040ff13&@2| @36 +|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @8|3|,|1| @11|T|o|p +|<+0#4040ff13&@2| +0#af5f00255&|d+0#0000000&| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d| |w|o|r|d> @4 +| +0#af5f00255&@1|2| |t+0#0000000&|w|o| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o +| +0#af5f00255&@3|n+0#0000000&|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r|d| |l|o|n|g| |w|o|r +| +0#af5f00255&@3|d+0#0000000&| @34 +| +0#af5f00255&@1|3| |l+0#0000000&|i|n|e| @31 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @8|1|,|1|0|4| @9|T|o|p +|:+0&&|b|o|t|r|i|g|h|t| |s|p| @27
--- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -137,6 +137,7 @@ func Test_smoothscroll_number() 'line', ]) set smoothscroll + set splitkeep=topline set number cpo+=n :3 @@ -167,8 +168,16 @@ func Test_smoothscroll_number() call term_sendkeys(buf, "\<C-Y>") call VerifyScreenDump(buf, 'Test_smooth_number_6', {}) + call term_sendkeys(buf, ":botright split\<CR>gg") + call VerifyScreenDump(buf, 'Test_smooth_number_7', {}) + call term_sendkeys(buf, "\<C-E>") + call VerifyScreenDump(buf, 'Test_smooth_number_8', {}) + call term_sendkeys(buf, "\<C-E>") + call VerifyScreenDump(buf, 'Test_smooth_number_9', {}) + call term_sendkeys(buf, ":close\<CR>") + call term_sendkeys(buf, ":call DoRel()\<CR>") - call VerifyScreenDump(buf, 'Test_smooth_number_7', {}) + call VerifyScreenDump(buf, 'Test_smooth_number_10', {}) call StopVimInTerminal(buf) endfunc