# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454413504 -3600
# Node ID e7afe45a202a0b55c63398cc2a84baec25cbbf68
# Parent  e1b6d79bb9853a7bb42e8a932e74ba41e1ec1781
commit https://github.com/vim/vim/commit/d9ea9069f5ef5b8b9f9e0d0daecdd124e2dcd818
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Feb 2 12:38:02 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1237,
+/**/
     1236,
 /**/
     1235,