summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-07 20:29:00 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-07 20:29:00 +0100
commitdc94a26a641914df5f1ba1ab47a5752e1137287e (patch)
treeb369e421b1094a04f4ab4a4c9c1910e6e28231db
parent942d6b22686858c9e72f8b8929df5c288170179c (diff)
downloadvim-git-dc94a26a641914df5f1ba1ab47a5752e1137287e.tar.gz
patch 7.4.1284v7.4.1284
Problem: Test 49 fails. Solution: Check for a different error message.
-rw-r--r--src/testdir/test49.vim5
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim
index 5973b1c5b..e763c6f67 100644
--- a/src/testdir/test49.vim
+++ b/src/testdir/test49.vim
@@ -1,6 +1,6 @@
" Vim script language tests
" Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
-" Last Change: 2016 Jan 02
+" Last Change: 2016 Feb 07
"-------------------------------------------------------------------------------
" Test environment {{{1
@@ -5749,8 +5749,7 @@ function! F()
if !caught && !$VIMNOERRTHROW
Xpath 8192 " X: 0
endif
- if caught ? !MSG('E55', 'Unmatched \\)')
- \ : !MSG('E475', "Invalid argument")
+ if !MSG('E475', "Invalid argument")
Xpath 16384 " X: 0
endif
if !caught
diff --git a/src/version.c b/src/version.c
index dab9368fc..c2d75bbe8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1284,
+/**/
1283,
/**/
1282,