patch 7.4.1237

Problem:    Can't translate message without adding a line break.
Solution:   Join the two parts of the message.

diff --git a/src/memline.c b/src/memline.c
index 15810fdad050a6595b978ef049ad65f0ccd9bfdd..969e1e292ff11e14360e0ac852a1a23914efcd8d 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -4075,8 +4075,7 @@ attention_message(
     }
     /* Some of these messages are long to allow translation to
      * other languages. */
-    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(_("\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.  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);

diff --git a/src/version.c b/src/version.c
index 165b396c9f087e6836e87a6f18332c7352f9f60d..53949e63d99d93d4aa49e8c7a82424fc894d96aa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1237,
 /**/
     1236,
 /**/