diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2022-09-02 12:16:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-02 12:16:21 +0100 |
| commit | a02a8a4d849906ae100f46f23642b5f7d1bd314e (patch) | |
| tree | d5f20000e11bed560f6ff1135860edba4355305f | |
| parent | 6c667bdc9489963102bd6c46b1b73e4d43c034ce (diff) | |
patch 9.0.0356: :echowindow sets the in_echowindow flag too earlyv9.0.0356
Problem: :echowindow sets the in_echowindow flag too early.
Solution: Set in_echowindow only when outputting the text. (Yasuhiro
Matsumoto, closes #11033)
| -rw-r--r-- | src/eval.c | 20 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_echowin_eval.dump | 8 | ||||
| -rw-r--r-- | src/testdir/test_messages.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 41 insertions, 9 deletions
diff --git a/src/eval.c b/src/eval.c index f55d9de8ec..2dfe8174ab 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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); } diff --git a/src/testdir/dumps/Test_echowin_eval.dump b/src/testdir/dumps/Test_echowin_eval.dump new file mode 100644 index 0000000000..80d5fc7c11 --- /dev/null +++ b/src/testdir/dumps/Test_echowin_eval.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|═+0#e000002&@74 +|t|e|s|t| @70 +|1+0#0000000&|2|3| @53|0|,|0|-|1| @8|A|l@1| diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim index 10af69c67d..07a4b229a7 100644 --- a/src/testdir/test_messages.vim +++ b/src/testdir/test_messages.vim @@ -420,5 +420,25 @@ func Test_echowindow() call delete('XtestEchowindow') endfunc +" messages window should not be used while evaluating the :echowin argument +func Test_echowin_eval() + CheckScreendump + + let lines =<< trim END + func ShowMessage() + echo 123 + return 'test' + endfunc + echowindow ShowMessage() + END + call writefile(lines, 'XtestEchowindow') + let buf = RunVimInTerminal('-S XtestEchowindow', #{rows: 8}) + call VerifyScreenDump(buf, 'Test_echowin_eval', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('XtestEchowindow') +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 356ac7796a..f017ba1d1e 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 356, +/**/ 355, /**/ 354, |