mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 08:48:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25396 from bfredl/no_attr

Browse Source 
refactor(messages): fold msg() functions with and without attr
This commit is contained in:
bfredl
2023-09-27 23:49:47 +02:00
committed by GitHub
parent 86b7d8a9f5 448d4837be
commit e46f5aab89
42 changed files with 382 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/fileio.c
View File

@@ -118,7 +118,7 @@ void filemess(buf_T *buf, char *name, char *s, int attr)
msg_scroll = msg_scroll_save;
msg_scrolled_ign = true;
// may truncate the message to avoid a hit-return prompt
msg_outtrans_attr(msg_may_trunc(false, IObuff), attr);
msg_outtrans(msg_may_trunc(false, IObuff), attr);
msg_clr_eos();
ui_flush();
msg_scrolled_ign = false;
@@ -1762,7 +1762,7 @@ failed:
if (msg_col > 0) {
msg_putchar('\r'); // overwrite previous message
}
p = (uint8_t *)msg_trunc_attr(IObuff, false, 0);
p = (uint8_t *)msg_trunc(IObuff, false, 0);
}
if (read_stdin || read_buffer || restart_edit != 0
@@ -2035,7 +2035,7 @@ static char *readfile_charconvert(char *fname, char *fenc, int *fdp)
if (errmsg != NULL) {
// Don't use emsg(), it breaks mappings, the retry with
// another type of conversion might still work.
msg(errmsg);
msg(errmsg, 0);
if (tmpname != NULL) {
os_remove(tmpname); // delete converted file
XFREE_CLEAR(tmpname);