kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

only check got_int with ex_echo

Browse Source 
Ref: https://github.com/neovim/neovim/pull/10926#discussion_r320706446
This commit is contained in:
Daniel Hahler 2019-09-04 13:30:11 +02:00
parent 4556bb90fa
commit ac6fd11fa1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@ -20903,7 +20903,7 @@ void ex_echo(exarg_T *eap)
char *tofree = encode_tv2echo(&rettv, NULL); char *tofree = encode_tv2echo(&rettv, NULL);
if (*tofree != NUL) { if (*tofree != NUL) {
msg_ext_set_kind("echo"); msg_ext_set_kind("echo");
msg_multiline_attr(tofree, echo_attr); msg_multiline_attr(tofree, echo_attr, true);
} }
xfree(tofree); xfree(tofree);
} }

6
src/nvim/message.c
View File

@ -222,12 +222,12 @@ int msg_attr(const char *s, const int attr)
} }
/// similar to msg_outtrans_attr, but support newlines and tabs. /// similar to msg_outtrans_attr, but support newlines and tabs.
void msg_multiline_attr(const char *s, int attr) void msg_multiline_attr(const char *s, int attr, bool check_int)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
const char *next_spec = s; const char *next_spec = s;
while (next_spec != NULL && !got_int) { while (next_spec != NULL && (!check_int || !got_int)) {
next_spec = strpbrk(s, "\t\n\r"); next_spec = strpbrk(s, "\t\n\r");
if (next_spec != NULL) { if (next_spec != NULL) {
@ -306,7 +306,7 @@ bool msg_attr_keep(char_u *s, int attr, bool keep, bool multiline)
s = buf; s = buf;
if (multiline) { if (multiline) {
msg_multiline_attr((char *)s, attr); msg_multiline_attr((char *)s, attr, false);
} else { } else {
msg_outtrans_attr(s, attr); msg_outtrans_attr(s, attr);
} }