Patch 9.0.0472
Problem: Virtual text "below" doesn't show in list mode.
Solution: Reset lcs_eol_one when displaying text property.
Files: src/drawline.c, src/testdir/test_textprop.vim,
src/testdir/dumps/Test_prop_text_with_padding_4.dump
*** ../vim-9.0.0471/src/drawline.c 2022-09-12 19:24:31.136076277 +0100
--- src/drawline.c 2022-09-15 19:41:22.252810275 +0100
***************
*** 1888,1893 ****
--- 1888,1898 ----
p_extra_free2 = wlv.p_extra;
}
+ if (lcs_eol_one < 0 && wlv.col
+ + wlv.n_extra - 2 > wp->w_width)
+ // don't bail out at end of line
+ lcs_eol_one = 0;
+
// When 'wrap' is off then for "below" we need
// to start a new line explictly.
if (start_line)
*** ../vim-9.0.0471/src/testdir/test_textprop.vim 2022-09-14
22:13:06.069843985 +0100
--- src/testdir/test_textprop.vim 2022-09-15 19:26:29.074792262 +0100
***************
*** 3181,3186 ****
--- 3181,3189 ----
call term_sendkeys(buf, "ggix\<Esc>")
call VerifyScreenDump(buf, 'Test_prop_text_with_padding_3', {})
+ call term_sendkeys(buf, ":set list\<CR>")
+ call VerifyScreenDump(buf, 'Test_prop_text_with_padding_4', {})
+
call StopVimInTerminal(buf)
call delete('XscriptPropsPadded')
endfunc
*** ../vim-9.0.0471/src/testdir/dumps/Test_prop_text_with_padding_4.dump
2022-09-15 19:43:35.468494529 +0100
--- src/testdir/dumps/Test_prop_text_with_padding_4.dump 2022-09-15
19:41:28.344795898 +0100
***************
*** 0 ****
--- 1,8 ----
+ >x+0&#ffffff0@10|S|o|m|e| |t|e|x|t| |t|o| |a|d@1| |v|i|r|t|u|a|l| |t|e|x|t|
|t|o|.|$+0#4040ff13&| +0#0000000&@2|a+0&#ffd7ff255|f|t|e|r| +0&#ffffff0@6
+ @47|r+0&#ffd7ff255|i|g|h|t| |a|l|i|g|n|e|d
+ | +0&#ffffff0@3|b+0&#ffd7ff255|e|l|o|w| |t|h|e| |l|i|n|e| +0&#ffffff0@41
+ |s|e|c|o|n|d| |l|i|n|e|$+0#4040ff13&| +0#0000000&@47
+ |x|A|n|o|t|h|e|r| |l|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |t|o| |m|a|k|e|
|t|h|e| |w|r|a|p|.|$+0#4040ff13&| +0#0000000&@12
+ @51|r+0&#ffd7ff255|i|g|h|t|m|o|s|t
+ | +0&#ffffff0@59
+ |:|s|e|t| |l|i|s|t| @32|1|,|1| @10|A|l@1|
*** ../vim-9.0.0471/src/version.c 2022-09-15 17:44:03.726468280 +0100
--- src/version.c 2022-09-15 19:42:29.428651370 +0100
***************
*** 705,706 ****
--- 705,708 ----
{ /* Add new patch number below this line */
+ /**/
+ 472,
/**/
--
hundred-and-one symptoms of being an internet addict:
87. Everyone you know asks why your phone line is always busy ...and
you tell them to send an e-mail.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220915184503.C90CB1C082B%40moolenaar.net.
