From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 7 Feb 2016 19:29:00 +0000 (+0100)
Subject: patch 7.4.1284
X-Git-Tag: v7.4.1284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc94a26a641914df5f1ba1ab47a5752e1137287e;p=thirdparty%2Fvim.git

patch 7.4.1284
Problem:    Test 49 fails.
Solution:   Check for a different error message.
---

diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim
index 5973b1c5bb..e763c6f677 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 dab9368fc9..c2d75bbe82 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1284,
 /**/
     1283,
 /**/