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 5973b1c5bb89b7e43f113a738af73e70779e6ffa..e763c6f6778830ac4887d5121761097d04cef5b8 100644 (file)
--- 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 dab9368fc994eb0d5905c48831cacebfbdfdd87d..c2d75bbe82fae6f693a30e311f6c603868378e0b 100644 (file)
--- 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,
 /**/