diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-20 14:51:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-20 14:51:23 +0200 |
| commit | 83e9a1ce75818a78c5ddf8dcfb820634ca6fabff (patch) | |
| tree | efa636e045daf54a4f57e8bbb7974d89a7d6ab45 | |
| parent | 82260afb0ec358f50df9816511f480d455a1cdac (diff) | |
| download | vim-git-83e9a1ce75818a78c5ddf8dcfb820634ca6fabff.tar.gz | |
patch 8.1.2190: syntax test fails on Macv8.1.2190
Problem: Syntax test fails on Mac.
Solution: Limit the window size to 20 rows.
| -rw-r--r-- | src/testdir/dumps/Test_syntax_c_01.dump | 6 | ||||
| -rw-r--r-- | src/testdir/test_syntax.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/testdir/dumps/Test_syntax_c_01.dump b/src/testdir/dumps/Test_syntax_c_01.dump index 4bef1b71c..72242162e 100644 --- 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 c87b3d65e..21ee8dc62 100644 --- 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 83609888e..caf8ccf2b 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2190, +/**/ 2189, /**/ 2188, |