diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-02-17 02:08:21 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-02-17 02:08:21 +0100 |
| commit | 706b01ba7999b65da68055a7ac75c2be410ffd2c (patch) | |
| tree | 10d60b3bb28151dde32730f34e7dfdd0074e2cbd /src/nvim/ex_eval.c | |
| parent | 4a107a11a1c708c2fb8e40b6464f080aca111767 (diff) | |
| parent | 095e6cc2e098db110981e5f9ea4bbc0ce316cecb (diff) | |
| download | rneovim-706b01ba7999b65da68055a7ac75c2be410ffd2c.tar.gz rneovim-706b01ba7999b65da68055a7ac75c2be410ffd2c.tar.bz2 rneovim-706b01ba7999b65da68055a7ac75c2be410ffd2c.zip | |
Merge #6114 'Partial string handling refactoring'.
Diffstat (limited to 'src/nvim/ex_eval.c')
| -rw-r--r-- | src/nvim/ex_eval.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index f518fa0d66..4bb6f97035 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -482,7 +482,7 @@ static int throw_exception(void *value, int type, char_u *cmdname) msg_scroll = TRUE; /* always scroll up, don't overwrite */ smsg(_("Exception thrown: %s"), excp->value); - msg_puts((char_u *)"\n"); /* don't overwrite this either */ + msg_puts("\n"); // don't overwrite this either if (debug_break_level > 0 || *p_vfile == NUL) cmdline_row = msg_row; @@ -532,15 +532,17 @@ static void discard_exception(except_T *excp, int was_finished) smsg(was_finished ? _("Exception finished: %s") : _("Exception discarded: %s"), excp->value); - msg_puts((char_u *)"\n"); /* don't overwrite this either */ - if (debug_break_level > 0 || *p_vfile == NUL) + msg_puts("\n"); // don't overwrite this either + if (debug_break_level > 0 || *p_vfile == NUL) { cmdline_row = msg_row; - --no_wait_return; - if (debug_break_level > 0) + } + no_wait_return--; + if (debug_break_level > 0) { msg_silent = save_msg_silent; - else + } else { verbose_leave(); - STRCPY(IObuff, saved_IObuff); + } + xstrlcpy((char *)IObuff, (const char *)saved_IObuff, IOSIZE); xfree(saved_IObuff); } if (excp->type != ET_INTERRUPT) @@ -595,7 +597,7 @@ static void catch_exception(except_T *excp) msg_scroll = TRUE; /* always scroll up, don't overwrite */ smsg(_("Exception caught: %s"), excp->value); - msg_puts((char_u *)"\n"); /* don't overwrite this either */ + msg_puts("\n"); // don't overwrite this either if (debug_break_level > 0 || *p_vfile == NUL) cmdline_row = msg_row; @@ -714,7 +716,7 @@ static void report_pending(int action, int pending, void *value) ++no_wait_return; msg_scroll = TRUE; /* always scroll up, don't overwrite */ smsg(mesg, s); - msg_puts((char_u *)"\n"); /* don't overwrite this either */ + msg_puts("\n"); // don't overwrite this either cmdline_row = msg_row; --no_wait_return; if (debug_break_level > 0) |