# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454873405 -3600
# Node ID 96fe78b32ad55bb56ac6505be71abd09c6872b05
# Parent  004197c4dc0deb441fd65f6a41546193d388302e
commit https://github.com/vim/vim/commit/dc94a26a641914df5f1ba1ab47a5752e1137287e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 7 20:29:00 2016 +0100

    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
--- 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
--- 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,