From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 23 Jan 2014 17:12:49 +0000 (+0100)
Subject: updated for version 7.4.157
X-Git-Tag: v7.4.157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d587cbd9450d1a28dfb40c5204e9071f7bd955;p=thirdparty%2Fvim.git

updated for version 7.4.157
Problem:    Error number used twice. (Yukihiro Nakadaira)
Solution:   Change the one not referred in the docs.
---

diff --git a/src/undo.c b/src/undo.c
index c16f2afa75..9e72d1f74d 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -409,7 +409,7 @@ u_savecommon(top, bot, newbot, reload)
 	{
 	    /* This happens when the FileChangedRO autocommand changes the
 	     * file in a way it becomes shorter. */
-	    EMSG(_("E834: Line count changed unexpectedly"));
+	    EMSG(_("E881: Line count changed unexpectedly"));
 	    return FAIL;
 	}
 #endif
diff --git a/src/version.c b/src/version.c
index f916026fe9..b80bacdbab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    157,
 /**/
     156,
 /**/