summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-01-23 18:12:49 +0100
committerBram Moolenaar <Bram@vim.org>2014-01-23 18:12:49 +0100
commitb4d587cbd9450d1a28dfb40c5204e9071f7bd955 (patch)
tree49ee7b74b3f001946e9bc24d9993745d5a9f9016
parent4a36bcf0d8303c0ba6964f23e24a766242771ef3 (diff)
downloadvim-git-b4d587cbd9450d1a28dfb40c5204e9071f7bd955.tar.gz
updated for version 7.4.157v7.4.157
Problem: Error number used twice. (Yukihiro Nakadaira) Solution: Change the one not referred in the docs.
-rw-r--r--src/undo.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/undo.c b/src/undo.c
index c16f2afa7..9e72d1f74 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 f916026fe..b80bacdba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 157,
+/**/
156,
/**/
155,