patch 8.1.2190: syntax test fails on Mac

Problem:    Syntax test fails on Mac.
Solution:   Limit the window size to 20 rows.

diff --git a/src/testdir/dumps/Test_syntax_c_01.dump b/src/testdir/dumps/Test_syntax_c_01.dump
index 4bef1b71c83961b8301c3e65f25a7dd5f52a31ef..72242162ed9afba24a1790b60395a47500f15429 100644 (file)
--- a/src/testdir/dumps/Test_syntax_c_01.dump
+++ b/src/testdir/dumps/Test_syntax_c_01.dump
@@ -1,7 +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
-@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
+|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,4 +17,4 @@
 @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| 
+|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|2| @8|8|,|3|7| @9|A|l@1| 

diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index c87b3d65e3241f090054d0888b756e8b0251ab4c..21ee8dc62803a1050abbc2c3a408f60e8aee918a 100644 (file)
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -538,9 +538,7 @@ func Test_syntax_c()
   endif
   call writefile([
        \ '/* comment line at the top */',
-       \ '  int',
-       \ 'main(int argc, char **argv)// another comment',
-       \ '{',
+       \ 'int main(int argc, char **argv) { // another comment',
        \ '#if 0',
        \ '   int   not_used;',
        \ '#else',
@@ -564,7 +562,7 @@ func Test_syntax_c()
   " response to t_RB corrects it to "light".
   let $COLORFGBG = '15;0'
 
-  let buf = RunVimInTerminal('Xtest.c', #{rows: 22})
+  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")

diff --git a/src/version.c b/src/version.c
index 83609888ea006c56cb7d394eb9ec9f64e1ece32c..caf8ccf2bac9c57b31bc539c30d4f206ac66a98c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2190,
 /**/
     2189,
 /**/