Patch 8.1.2158

Bram Moolenaar Wed, 16 Oct 2019 09:13:17 -0700


Patch 8.1.2158
Problem:    Terminal attributes missing in Terminal-normal mode.
Solution:   Use "syntax_attr".
Files:      src/drawline.c, src/testdir/test_terminal.vim,
            src/testdir/dumps/Test_terminal_dumpload.dump



*** ../vim-8.1.2157/src/drawline.c      2019-10-16 16:57:02.920817250 +0200
--- src/drawline.c      2019-10-16 18:10:54.402445583 +0200
***************
*** 1517,1523 ****
                else
  #endif
  #ifdef FEAT_SYN_HL
!               if (has_syntax)
                    char_attr = syntax_attr;
                else
  #endif
--- 1517,1523 ----
                else
  #endif
  #ifdef FEAT_SYN_HL
!               if (has_syntax || get_term_attr)
                    char_attr = syntax_attr;
                else
  #endif
*** ../vim-8.1.2157/src/testdir/test_terminal.vim       2019-10-16 
16:31:13.133277343 +0200
--- src/testdir/test_terminal.vim       2019-10-16 18:09:14.622866722 +0200
***************
*** 1140,1145 ****
--- 1140,1159 ----
    quit
  endfunc
  
+ func Test_terminal_dumpload_dump()
+   CheckRunVimInTerminal
+ 
+   let lines =<< trim END
+      call term_dumpload('dumps/Test_popupwin_22.dump', #{term_rows: 12})
+   END
+   call writefile(lines, 'XtermDumpload')
+   let buf = RunVimInTerminal('-S XtermDumpload', #{rows: 15})
+   call VerifyScreenDump(buf, 'Test_terminal_dumpload', {})
+ 
+   call StopVimInTerminal(buf)
+   call delete('XtermDumpload')
+ endfunc
+ 
  func Test_terminal_dumpdiff()
    call assert_equal(1, winnr('$'))
    eval 
'dumps/Test_popup_command_01.dump'->term_dumpdiff('dumps/Test_popup_command_02.dump')
*** ../vim-8.1.2157/src/testdir/dumps/Test_terminal_dumpload.dump       
2019-10-16 18:11:08.110387613 +0200
--- src/testdir/dumps/Test_terminal_dumpload.dump       2019-10-16 
18:09:22.474833642 +0200
***************
*** 0 ****
--- 1,15 ----
+ >1+0&#ffffff0| @73
+ |2| |╔+0&#5fd7ff255|═@11|╗| +0&#ffffff0@5|╔+0&#dadada255|═@11|╗+0&#8a8a8a255| 
+0&#ffffff0@5|x+0&#5fd7ff255@13| +0&#ffffff0@2|#+0&#5fd7ff255|x@11|#| 
+0&#ffffff0@1
+ |3| |║+0&#5fd7ff255|h+0#0000001#ffd7ff255|e|l@1|o| 
|b|o|r|d|e|r|║+0#0000000#5fd7ff255| 
+0&#ffffff0@5|║+0&#a8a8a8255|h+0#0000001#ffd7ff255|e|l@1|o| 
|b|o|r|d|e|r|║+0#0000000#8a8a8a255| 
+0&#ffffff0@5|x+0&#5fd7ff255|h+0#0000001#ffd7ff255|e|l@1|o| 
|b|o|r|d|e|r|x+0#0000000#5fd7ff255| 
+0&#ffffff0@2|x+0&#5fd7ff255|h+0#0000001#ffd7ff255|e|l@1|o| 
|b|o|r|d|e|r|x+0#0000000#5fd7ff255| +0&#ffffff0@1
+ |4| |╚+0&#5fd7ff255|═@11|╝| 
+0&#ffffff0@5|║+0&#a8a8a8255|a+0#0000001#ffd7ff255|n|d| |m|o|r|e| 
@3|║+0#0000000#8a8a8a255| 
+0&#ffffff0@5|x+0&#5fd7ff255|l+0#0000001#ffd7ff255|i|n|e|s| |o|n|l|y| 
@1|x+0#0000000#5fd7ff255| 
+0&#ffffff0@2|x+0&#5fd7ff255|w+0#0000001#ffd7ff255|i|t|h| 
|c|o|r|n|e|r|s|x+0#0000000#5fd7ff255| +0&#ffffff0@1
+ |5| @20|╚+0&#585858255|═@11|╝| +0&#ffffff0@5|x+0&#5fd7ff255@13| 
+0&#ffffff0@2|#+0&#5fd7ff255|x@11|#| +0&#ffffff0@1
+ |6| |4+0&#5fd7ff255|0@11|5| +0&#ffffff0@58
+ |7| |3+0&#5fd7ff255|h+0#0000001#ffd7ff255|e|l@1|o| 
|b|o|r|d|e|r|1+0#0000000#5fd7ff255| +0&#ffffff0@5| +0&#5fd7ff255@13| 
+0&#ffffff0@38
+ |8| |3+0&#5fd7ff255|w+0#0000001#ffd7ff255|i|t|h| 
|n|u|m|b|e|r|s|1+0#0000000#5fd7ff255| +0&#ffffff0@5| 
+0&#5fd7ff255|h+0#0000001#ffd7ff255|e|l@1|o| |b|o|r|d|e|r| 
+0#0000000#5fd7ff255| +0&#ffffff0@38
+ |9| |7+0&#5fd7ff255|2@11|6| +0&#ffffff0@5| 
+0&#5fd7ff255|j+0#0000001#ffd7ff255|u|s|t| |b|l|a|n|k|s| | 
+0#0000000#5fd7ff255| +0&#ffffff0@38
+ |1|0| @19| +0&#5fd7ff255@13| +0&#ffffff0@38
+ |1@1| @72
+ |d+2#ffffff16#00e0003|u|m|p| |d|i|f@1| 
|d|u|m|p|s|/|T|e|s|t|_|p|o|p|u|p|w|i|n|_|2@1|.|d|u|m|p| |[|f|i|n|i|s|h|e|d|]| 
@8|1|,|1| @11|T|o|p
+ | +0#0000000#ffffff0@74
+ |[+1&&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+ | +0&&@74
*** ../vim-8.1.2157/src/version.c       2019-10-16 17:15:15.555232900 +0200
--- src/version.c       2019-10-16 18:01:37.668768938 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     2158,
  /**/

-- 
ARTHUR: If you do not open these doors, we will take this castle by force ...
   [A bucket of slops land on ARTHUR.  He tries to retain his dignity.]
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            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/201910161612.x9GGCBVM027312%40masaka.moolenaar.net.

Patch 8.1.2158

Raspunde prin e-mail lui