patch 8.2.0728: messages about a deadly signal are not left aligned

Problem:    Messages about a deadly signal are not left aligned.
Solution:   Output a CR before the NL. (Dominique Pelle, #6055)

diff --git a/src/misc1.c b/src/misc1.c
index 6686a35146248fac1f471bb0d404b8bc7a8d9c20..a370a82f8d99e0908901a8c746796f76d06fcd8b 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2174,7 +2174,7 @@ preserve_exit(void)
     {
        if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL)
        {
-           OUT_STR("Vim: preserving files...\n");
+           OUT_STR("Vim: preserving files...\r\n");
            screen_start();         // don't know where cursor is now
            out_flush();
            ml_sync_all(FALSE, FALSE);  // preserve all swap files
@@ -2184,7 +2184,7 @@ preserve_exit(void)
 
     ml_close_all(FALSE);           // close all memfiles, without deleting
 
-    OUT_STR("Vim: Finished.\n");
+    OUT_STR("Vim: Finished.\r\n");
 
     getout(1);
 }

diff --git a/src/os_unix.c b/src/os_unix.c
index 8424b11a3c087768efbb6d4aecf05ff8af850073..596fb0e90633d29e1862660476fe7fa570f4f9cc 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1083,10 +1083,10 @@ deathtrap SIGDEFARG(sigarg)
 
     // No translation, it may call malloc().
 #ifdef SIGHASARG
-    sprintf((char *)IObuff, "Vim: Caught deadly signal %s\n",
+    sprintf((char *)IObuff, "Vim: Caught deadly signal %s\r\n",
                                                         signal_info[i].name);
 #else
-    sprintf((char *)IObuff, "Vim: Caught deadly signal\n");
+    sprintf((char *)IObuff, "Vim: Caught deadly signal\r\n");
 #endif
 
     // Preserve files and exit.  This sets the really_exiting flag to prevent

diff --git a/src/version.c b/src/version.c
index 55b865409ea74784285679855984d146bebe54d0..c595e9df45aa000ab3182a79e1ccb42dec12f9ab 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    728,
 /**/
     727,
 /**/