Skip to content

Commit 83e9a1c

Browse files
committed
patch 8.1.2190: syntax test fails on Mac
Problem: Syntax test fails on Mac. Solution: Limit the window size to 20 rows.
1 parent 82260af commit 83e9a1c

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/testdir/dumps/Test_syntax_c_01.dump

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
|/+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-
@2|i+0#00e0003&|n|t| +0#0000000&@69
3-
|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
4-
|{| @73
2+
|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
53
|#+0#e000e06&|i|f| |0| +0#0000000&@69
64
| +0#0000e05&@2|i|n|t| @2|n|o|t|_|u|s|e|d|;| +0#0000000&@56
75
|#+0#e000e06&|e|l|s|e| +0#0000000&@69
@@ -19,4 +17,4 @@
1917
@8|}| @65
2018
@8|N+0&#ffff4012|o|t|e|:+0&#ffffff0| |a|s|d|f| @56
2119
|}| @73
22-
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|2| @8|1|0|,|3|7| @8|A|l@1|
20+
|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@34|2| @8|8|,|3|7| @9|A|l@1|

src/testdir/test_syntax.vim

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,9 +538,7 @@ func Test_syntax_c()
538538
endif
539539
call writefile([
540540
\ '/* comment line at the top */',
541-
\ ' int',
542-
\ 'main(int argc, char **argv)// another comment',
543-
\ '{',
541+
\ 'int main(int argc, char **argv) { // another comment',
544542
\ '#if 0',
545543
\ ' int not_used;',
546544
\ '#else',
@@ -564,7 +562,7 @@ func Test_syntax_c()
564562
" response to t_RB corrects it to "light".
565563
let $COLORFGBG = '15;0'
566564

567-
let buf = RunVimInTerminal('Xtest.c', #{rows: 22})
565+
let buf = RunVimInTerminal('Xtest.c', {})
568566
call term_sendkeys(buf, ":syn keyword Search Note\r")
569567
call term_sendkeys(buf, ":syn match Error /^\\s\\+$/\r")
570568
call term_sendkeys(buf, ":set hlsearch\r")

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
2190,
744746
/**/
745747
2189,
746748
/**/

0 commit comments

Comments
 (0)