diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-10 14:14:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-10 14:14:03 +0200 |
| commit | 69212b11d18d9d8951968f6ca88e6ce046c90675 (patch) | |
| tree | bafe83527480cae15c9452542cd7ad3c88db6458 | |
| parent | d695ba732de915fc227c1069a7a4e1d5049601bd (diff) | |
patch 8.2.0728: messages about a deadly signal are not left alignedv8.2.0728
Problem: Messages about a deadly signal are not left aligned.
Solution: Output a CR before the NL. (Dominique Pelle, #6055)
| -rw-r--r-- | src/misc1.c | 4 | ||||
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/misc1.c b/src/misc1.c index 6686a35146..a370a82f8d 100644 --- 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 8424b11a3c..596fb0e906 100644 --- 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 55b865409e..c595e9df45 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 728, +/**/ 727, /**/ 726, |