To: vim_dev@googlegroups.com Subject: Patch 9.0.0125 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0125 Problem: Cursor positioned wrong with virtual text after the line. Solution: Clear cts_with_trailing. Files: src/charset.c, src/testdir/test_textprop.vim, src/testdir/dumps/Test_prop_with_text_after_1.dump *** ../vim-9.0.0124/src/charset.c 2022-07-31 18:03:54.347103073 +0100 --- src/charset.c 2022-08-01 11:12:31.589965540 +0100 *************** *** 921,926 **** --- 921,927 ---- cts->cts_text_prop_count = 0; cts->cts_has_prop_with_text = FALSE; cts->cts_cur_text_width = 0; + cts->cts_with_trailing = 0; if (lnum > 0) { char_u *prop_start; *** ../vim-9.0.0124/src/testdir/test_textprop.vim 2022-07-31 17:11:47.898558951 +0100 --- src/testdir/test_textprop.vim 2022-08-01 11:15:55.417975548 +0100 *************** *** 2224,2229 **** --- 2224,2233 ---- call prop_add(1, 0, #{type: 'rightprop', text: ' RIGHT ', text_align: 'right'}) call prop_add(1, 0, #{type: 'afterprop', text: ' AFTER ', text_align: 'after'}) call prop_add(1, 0, #{type: 'belowprop', text: ' BELOW ', text_align: 'below'}) + + call setline(2, 'Last line.') + call prop_add(2, 0, #{type: 'afterprop', text: ' After Last ', text_align: 'after'}) + normal G$ END call writefile(lines, 'XscriptPropsWithTextAfter') let buf = RunVimInTerminal('-S XscriptPropsWithTextAfter', #{rows: 6, cols: 60}) *** ../vim-9.0.0124/src/testdir/dumps/Test_prop_with_text_after_1.dump 2022-07-31 17:11:47.898558951 +0100 --- src/testdir/dumps/Test_prop_with_text_after_1.dump 2022-08-01 11:16:11.697976932 +0100 *************** *** 1,6 **** ! >s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |t|h|e|r|e| +0&#ffff4012|A|F|T|E|R| | +0&#ffffff0@10| +0#ffffff16#e000002|R|I|G|H|T| | +0#0000000#5fd7ff255|B|E|L|O|W| | +0&#ffffff0@52 |~+0#4040ff13&| @58 |~| @58 ! |~| @58 ! | +0#0000000&@41|1|,|1| @10|A|l@1| --- 1,6 ---- ! |s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |t|h|e|r|e| +0&#ffff4012|A|F|T|E|R| | +0&#ffffff0@10| +0#ffffff16#e000002|R|I|G|H|T| | +0#0000000#5fd7ff255|B|E|L|O|W| | +0&#ffffff0@52 + |L|a|s|t| |l|i|n|e>.| +0&#ffff4012|A|f|t|e|r| |L|a|s|t| | +0&#ffffff0@37 |~+0#4040ff13&| @58 |~| @58 ! | +0#0000000&@41|2|,|1|0| @9|A|l@1| *** ../vim-9.0.0124/src/version.c 2022-07-31 18:34:28.242324297 +0100 --- src/version.c 2022-08-01 11:13:45.845967441 +0100 *************** *** 737,738 **** --- 737,740 ---- { /* Add new patch number below this line */ + /**/ + 125, /**/ -- I noticed my daughter's Disney-net password on a sticky note: "MickeyMinnieGoofyPluto". I asked her why it was so long. "Because they say it has to have at least four characters." /// 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 ///