To: vim_dev@googlegroups.com Subject: Patch 9.0.1506 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1506 Problem: Line number not displayed when using 'smoothscroll'. Solution: Adjust condition for showing the line number. (closes #12333) Files: src/drawline.c, src/testdir/test_scroll_opt.vim, 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/dumps/Test_smooth_number_10.dump *** ../vim-9.0.1505/src/drawline.c 2023-04-23 21:42:01.794657514 +0100 --- src/drawline.c 2023-05-02 20:40:41.136386699 +0100 *************** *** 389,395 **** // 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_p_nu && wp->w_p_rnu))) { long num; --- 389,395 ---- // 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 > 0 || (wp->w_p_nu && wp->w_p_rnu))) { long num; *** ../vim-9.0.1505/src/testdir/test_scroll_opt.vim 2023-02-14 17:41:15.774305998 +0000 --- src/testdir/test_scroll_opt.vim 2023-05-02 20:40:41.136386699 +0100 *************** *** 137,142 **** --- 137,143 ---- 'line', ]) set smoothscroll + set splitkeep=topline set number cpo+=n :3 *************** *** 167,174 **** call term_sendkeys(buf, "\") call VerifyScreenDump(buf, 'Test_smooth_number_6', {}) ! call term_sendkeys(buf, ":call DoRel()\") call VerifyScreenDump(buf, 'Test_smooth_number_7', {}) call StopVimInTerminal(buf) endfunc --- 168,183 ---- call term_sendkeys(buf, "\") call VerifyScreenDump(buf, 'Test_smooth_number_6', {}) ! call term_sendkeys(buf, ":botright split\gg") call VerifyScreenDump(buf, 'Test_smooth_number_7', {}) + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_smooth_number_8', {}) + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_smooth_number_9', {}) + call term_sendkeys(buf, ":close\") + + call term_sendkeys(buf, ":call DoRel()\") + call VerifyScreenDump(buf, 'Test_smooth_number_10', {}) call StopVimInTerminal(buf) endfunc *** ../vim-9.0.1505/src/testdir/dumps/Test_smooth_number_7.dump 2022-11-18 12:52:23.418570894 +0000 --- src/testdir/dumps/Test_smooth_number_7.dump 2023-05-02 20:40:41.136386699 +0100 *************** *** 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| --- 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#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 *** ../vim-9.0.1505/src/testdir/dumps/Test_smooth_number_8.dump 2023-05-02 20:50:44.719881485 +0100 --- src/testdir/dumps/Test_smooth_number_8.dump 2023-05-02 20:40:41.136386699 +0100 *************** *** 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 *** ../vim-9.0.1505/src/testdir/dumps/Test_smooth_number_9.dump 2023-05-02 20:50:44.723881481 +0100 --- src/testdir/dumps/Test_smooth_number_9.dump 2023-05-02 20:40:41.136386699 +0100 *************** *** 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 *** ../vim-9.0.1505/src/testdir/dumps/Test_smooth_number_10.dump 2023-05-02 20:50:44.727881478 +0100 --- src/testdir/dumps/Test_smooth_number_10.dump 2023-05-02 20:40:41.136386699 +0100 *************** *** 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| *** ../vim-9.0.1505/src/version.c 2023-05-02 16:25:35.630819728 +0100 --- src/version.c 2023-05-02 20:42:16.492310749 +0100 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1506, /**/ -- Managers are like cats in a litter box. They instinctively shuffle things around to conceal what they've done. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///