summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-26 22:38:22 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-26 22:38:22 +0200
commitea7a08a53ea0e8b4fe1592d9ae4d8f581fef46f8 (patch)
tree5d568dc2dc40a2bf1aa043f5c153ea4ecd745379
parent92852cee3fcff1dc6ce12387b234634e73267b22 (diff)
downloadvim-git-ea7a08a53ea0e8b4fe1592d9ae4d8f581fef46f8.tar.gz
patch 8.1.1931: syntax test failsv8.1.1931
Problem: Syntax test fails. Solution: Add new javascriptreact type to completions.
-rw-r--r--src/testdir/test_syntax.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index 199a13493..0479901ce 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -393,7 +393,7 @@ endfunc
func Test_ownsyntax_completion()
call feedkeys(":ownsyntax java\<C-A>\<C-B>\"\<CR>", 'tx')
- call assert_equal('"ownsyntax java javacc javascript', @:)
+ call assert_equal('"ownsyntax java javacc javascript javascriptreact', @:)
endfunc
func Test_highlight_invalid_arg()
diff --git a/src/version.c b/src/version.c
index f0e441a13..9c8ff7099 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1931,
+/**/
1930,
/**/
1929,