aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-16 22:25:13 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-16 22:44:07 -0400
commit96a555346b294130e0b4f64f55b00d3838cc922f (patch)
tree059249b51624ab06fa16d30f40c8cdc6366b351e
parent288f7f8558c331fadcc72e9c7391fff08d42ba36 (diff)
downloadrneovim-96a555346b294130e0b4f64f55b00d3838cc922f.tar.gz
rneovim-96a555346b294130e0b4f64f55b00d3838cc922f.tar.bz2
rneovim-96a555346b294130e0b4f64f55b00d3838cc922f.zip
vim-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, vim/vim#6055) https://github.com/vim/vim/commit/69212b11d18d9d8951968f6ca88e6ce046c90675
-rw-r--r--src/nvim/misc1.c4
-rw-r--r--src/nvim/os/signal.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 6dafbafb3e..1cd9ff2c4d 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -983,7 +983,7 @@ void preserve_exit(void)
FOR_ALL_BUFFERS(buf) {
if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) {
- mch_errmsg((uint8_t *)"Vim: preserving files...\n");
+ mch_errmsg("Vim: preserving files...\r\n");
ui_flush();
ml_sync_all(false, false, true); // preserve all swap files
break;
@@ -992,7 +992,7 @@ void preserve_exit(void)
ml_close_all(false); // close all memfiles, without deleting
- mch_errmsg("Vim: Finished.\n");
+ mch_errmsg("Vim: Finished.\r\n");
getout(1);
}
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index bfe230b521..bc774b8ebc 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -161,8 +161,8 @@ static void deadly_signal(int signum)
WLOG("got signal %d (%s)", signum, signal_name(signum));
- snprintf((char *)IObuff, sizeof(IObuff), "Vim: Caught deadly signal '%s'\n",
- signal_name(signum));
+ snprintf((char *)IObuff, sizeof(IObuff), "Vim: Caught deadly signal '%s'\r\n",
+ signal_name(signum));
// Preserve files and exit.
preserve_exit();