aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.0356: :echowindow sets the in_echowindow flag too early

Browse Source 
Problem:    :echowindow sets the in_echowindow flag too early.
Solution:   Set in_echowindow only when outputting the text. (Yasuhiro
            Matsumoto, closes #11033)
This commit is contained in:
Yasuhiro Matsumoto
2022-09-02 12:16:21 +01:00
committed by Bram Moolenaar
parent 6c667bdc94
commit a02a8a4d84
4 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eval.c
View File

@@ -6728,10 +6728,6 @@ ex_execute(exarg_T *eap)
long start_lnum = SOURCING_LNUM;
ga_init2(&ga, 1, 80);
#ifdef HAS_MESSAGE_WINDOW
if (eap->cmdidx == CMD_echowindow)
start_echowindow();
#endif
if (eap->skip)
++emsg_skip;
@@ -6796,11 +6792,21 @@ ex_execute(exarg_T *eap)
msg_sb_eol();
}
if (eap->cmdidx == CMD_echomsg || eap->cmdidx == CMD_echowindow)
if (eap->cmdidx == CMD_echomsg)
{
msg_attr(ga.ga_data, echo_attr);
out_flush();
}
else if (eap->cmdidx == CMD_echowindow)
{
#ifdef HAS_MESSAGE_WINDOW
start_echowindow();
#endif
msg_attr(ga.ga_data, echo_attr);
#ifdef HAS_MESSAGE_WINDOW
end_echowindow();
#endif
}
else if (eap->cmdidx == CMD_echoconsole)
{
ui_write(ga.ga_data, (int)STRLEN(ga.ga_data), TRUE);
@@ -6832,10 +6838,6 @@ ex_execute(exarg_T *eap)
if (eap->skip)
--emsg_skip;
#ifdef HAS_MESSAGE_WINDOW
if (eap->cmdidx == CMD_echowindow)
end_echowindow();
#endif
set_nextcmd(eap, arg);
}