To: vim_dev@googlegroups.com
Subject: Patch 9.0.0116
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0116
Problem:    Virtual text not displayed if 'signcolumn' is "yes".
Solution:   Set c_extra and c_final to NUL.
Files:      src/drawline.c, src/testdir/test_textprop.vim,
            src/testdir/dumps/Test_prop_inserts_text.dump,
            src/testdir/dumps/Test_prop_inserts_text_1.dump,
            src/testdir/dumps/Test_prop_inserts_text_2.dump


*** ../vim-9.0.0115/src/drawline.c	2022-07-26 16:03:35.182058189 +0100
--- src/drawline.c	2022-07-30 21:27:20.284646898 +0100
***************
*** 1524,1529 ****
--- 1524,1531 ----
  			if (p != NULL)
  			{
  			    p_extra = p;
+ 			    c_extra = NUL;
+ 			    c_final = NUL;
  			    n_extra = (int)STRLEN(p);
  			    extra_attr = used_attr;
  			    n_attr = n_extra;
*** ../vim-9.0.0115/src/testdir/test_textprop.vim	2022-07-25 18:13:33.054580717 +0100
--- src/testdir/test_textprop.vim	2022-07-30 21:30:08.408451794 +0100
***************
*** 2204,2210 ****
    END
    call writefile(lines, 'XscriptPropsWithText')
    let buf = RunVimInTerminal('-S XscriptPropsWithText', #{rows: 6, cols: 60})
!   call VerifyScreenDump(buf, 'Test_prop_inserts_text', {})
  
    call StopVimInTerminal(buf)
    call delete('XscriptPropsWithText')
--- 2204,2213 ----
    END
    call writefile(lines, 'XscriptPropsWithText')
    let buf = RunVimInTerminal('-S XscriptPropsWithText', #{rows: 6, cols: 60})
!   call VerifyScreenDump(buf, 'Test_prop_inserts_text_1', {})
! 
!   call term_sendkeys(buf, ":set signcolumn=yes\<CR>")
!   call VerifyScreenDump(buf, 'Test_prop_inserts_text_2', {})
  
    call StopVimInTerminal(buf)
    call delete('XscriptPropsWithText')
*** ../vim-9.0.0115/src/testdir/dumps/Test_prop_inserts_text.dump	2022-07-25 18:13:33.054580717 +0100
--- src/testdir/dumps/Test_prop_inserts_text.dump	1970-01-01 00:00:00.000000000 +0000
***************
*** 1,6 ****
- |i+0&#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| |s|o
- |m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0&#5fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g> @27
- |~+0#4040ff13&| @58
- |~| @58
- |~| @58
- | +0#0000000&@41|1|,|7@1|-|9|3| @6|A|l@1| 
--- 0 ----
*** ../vim-9.0.0115/src/testdir/dumps/Test_prop_inserts_text_1.dump	2022-07-30 21:33:07.740210361 +0100
--- src/testdir/dumps/Test_prop_inserts_text_1.dump	2022-07-25 18:06:47.773105469 +0100
***************
*** 0 ****
--- 1,6 ----
+ |i+0&#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| |s|o
+ |m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0&#5fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g> @27
+ |~+0#4040ff13&| @58
+ |~| @58
+ |~| @58
+ | +0#0000000&@41|1|,|7@1|-|9|3| @6|A|l@1| 
*** ../vim-9.0.0115/src/testdir/dumps/Test_prop_inserts_text_2.dump	2022-07-30 21:33:07.748210351 +0100
--- src/testdir/dumps/Test_prop_inserts_text_2.dump	2022-07-30 21:30:59.780385689 +0100
***************
*** 0 ****
--- 1,6 ----
+ | +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| 
+ | +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|o|m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0&#5fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g> @23
+ |~+0#4040ff13&| @58
+ |~| @58
+ |~| @58
+ | +0#0000000&@41|1|,|7@1|-|9|3| @6|A|l@1| 
*** ../vim-9.0.0115/src/version.c	2022-07-30 19:10:03.569318597 +0100
--- src/version.c	2022-07-30 21:30:46.592402915 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     116,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
202. You're amazed to find out Spam is a food.

 /// 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    ///