From c41fc713bafb6940761261804407d7df3be3d41c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 15 Feb 2011 11:57:04 +0100 Subject: updated for version 7.3.120 Problem: The message for an existing swap file is too long to fit in a 25 line terminal. Solution: Make the message shorter. (Chad Miller) --- src/memline.c | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/memline.c b/src/memline.c index 410b1161b6..f70e8e32be 100644 --- a/src/memline.c +++ b/src/memline.c @@ -4071,9 +4071,9 @@ attention_message(buf, fname) } /* Some of these messages are long to allow translation to * other languages. */ - MSG_PUTS(_("\n(1) Another program may be editing the same file.\n If this is the case, be careful not to end up with two\n different instances of the same file when making changes.\n")); - MSG_PUTS(_(" Quit, or continue with caution.\n")); - MSG_PUTS(_("\n(2) An edit session for this file crashed.\n")); + MSG_PUTS(_("\n(1) Another program may be editing the same file. If this is the case,\n be careful not to end up with two different instances of the same\n file when making changes.")); + MSG_PUTS(_(" Quit, or continue with caution.\n")); + MSG_PUTS(_("(2) An edit session for this file crashed.\n")); MSG_PUTS(_(" If this is the case, use \":recover\" or \"vim -r ")); msg_outtrans(buf->b_fname); MSG_PUTS(_("\"\n to recover the changes (see \":help recovery\").\n")); diff --git a/src/version.c b/src/version.c index 962aa5cf52..cbb1ac7225 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 120, /**/ 119, /**/ -- cgit v1.2.3