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

Patch 8.1.2190
Problem:    Syntax test fails on Mac.
Solution:   Limit the window size to 20 rows.
Files:	    src/testdir/test_syntax.vim,
            src/testdir/dumps/Test_syntax_c_01.dump


*** ../vim-8.1.2189/src/testdir/test_syntax.vim	2019-10-20 13:16:18.639042106 +0200
--- src/testdir/test_syntax.vim	2019-10-20 14:48:13.598065514 +0200
***************
*** 538,546 ****
    endif
    call writefile([
  	\ '/* comment line at the top */',
! 	\ '  int',
! 	\ 'main(int argc, char **argv)// another comment',
! 	\ '{',
  	\ '#if 0',
  	\ '   int   not_used;',
  	\ '#else',
--- 538,544 ----
    endif
    call writefile([
  	\ '/* comment line at the top */',
! 	\ 'int main(int argc, char **argv) { // another comment',
  	\ '#if 0',
  	\ '   int   not_used;',
  	\ '#else',
***************
*** 564,570 ****
    " response to t_RB corrects it to "light".
    let $COLORFGBG = '15;0'
  
!   let buf = RunVimInTerminal('Xtest.c', #{rows: 22})
    call term_sendkeys(buf, ":syn keyword Search Note\r")
    call term_sendkeys(buf, ":syn match Error /^\\s\\+$/\r")
    call term_sendkeys(buf, ":set hlsearch\r")
--- 562,568 ----
    " response to t_RB corrects it to "light".
    let $COLORFGBG = '15;0'
  
!   let buf = RunVimInTerminal('Xtest.c', {})
    call term_sendkeys(buf, ":syn keyword Search Note\r")
    call term_sendkeys(buf, ":syn match Error /^\\s\\+$/\r")
    call term_sendkeys(buf, ":set hlsearch\r")
*** ../vim-8.1.2189/src/testdir/dumps/Test_syntax_c_01.dump	2019-10-20 13:16:18.639042106 +0200
--- src/testdir/dumps/Test_syntax_c_01.dump	2019-10-20 14:48:19.134044020 +0200
***************
*** 1,7 ****
  |/+0#0000e05#ffffff0|*| |c|o|m@1|e|n|t| |l|i|n|e| |a|t| |t|h|e| |t|o|p| |*|/| +0#0000000&@45
! @2|i+0#00e0003&|n|t| +0#0000000&@69
! |m|a|i|n|(|i+0#00e0003&|n|t| +0#0000000&|a|r|g|c|,| |c+0#00e0003&|h|a|r| +0#0000000&|*@1|a|r|g|v|)|/+0#0000e05&@1| |a|n|o|t|h|e|r| |c|o|m@1|e|n|t| +0#0000000&@29
! |{| @73
  |#+0#e000e06&|i|f| |0| +0#0000000&@69
  | +0#0000e05&@2|i|n|t| @2|n|o|t|_|u|s|e|d|;| +0#0000000&@56
  |#+0#e000e06&|e|l|s|e| +0#0000000&@69
--- 1,5 ----
  |/+0#0000e05#ffffff0|*| |c|o|m@1|e|n|t| |l|i|n|e| |a|t| |t|h|e| |t|o|p| |*|/| +0#0000000&@45
! |i+0#00e0003&|n|t| +0#0000000&|m|a|i|n|(|i+0#00e0003&|n|t| +0#0000000&|a|r|g|c|,| |c+0#00e0003&|h|a|r| +0#0000000&|*@1|a|r|g|v|)| |{| |/+0#0000e05&@1| |a|n|o|t|h|e|r| |c|o|m@1|e|n|t| +0#0000000&@22
  |#+0#e000e06&|i|f| |0| +0#0000000&@69
  | +0#0000e05&@2|i|n|t| @2|n|o|t|_|u|s|e|d|;| +0#0000000&@56
  |#+0#e000e06&|e|l|s|e| +0#0000000&@69
***************
*** 19,22 ****
  @8|}| @65
  @8|N+0&#ffff4012|o|t|e|:+0&#ffffff0| |a|s|d|f| @56
  |}| @73
! |-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|2| @8|1|0|,|3|7| @8|A|l@1| 
--- 17,20 ----
  @8|}| @65
  @8|N+0&#ffff4012|o|t|e|:+0&#ffffff0| |a|s|d|f| @56
  |}| @73
! |-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|2| @8|8|,|3|7| @9|A|l@1| 
*** ../vim-8.1.2189/src/version.c	2019-10-20 13:16:18.639042106 +0200
--- src/version.c	2019-10-20 14:50:48.789457979 +0200
***************
*** 743,744 ****
--- 743,746 ----
  {   /* Add new patch number below this line */
+ /**/
+     2190,
  /**/

-- 
I used to wonder about the meaning of life.  But I looked it
up in the dictionary under "L" and there it was - the meaning
of life.  It was less than I expected.              - Dogbert

 /// Bram Moolenaar -- Bram@Moolenaar.net -- 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    ///