diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-02 00:42:14 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-16 20:19:24 -0400 |
| commit | c4cbf16c917c619057ad4711a0121146420a7d74 (patch) | |
| tree | f7149fb97fd37b1ed9eeabf2583df19b13e00710 /src | |
| parent | 0af18a6a4325d24bf4c386edb81c2f3776dab787 (diff) | |
| download | rneovim-c4cbf16c917c619057ad4711a0121146420a7d74.tar.gz rneovim-c4cbf16c917c619057ad4711a0121146420a7d74.tar.bz2 rneovim-c4cbf16c917c619057ad4711a0121146420a7d74.zip | |
vim-patch:8.1.2141: :tselect has an extra hit-enter prompt
Problem: :tselect has an extra hit-enter prompt.
Solution: Do not set need_wait_return when only moving the cursor.
(closes vim/vim#5040)
https://github.com/vim/vim/commit/e8070987c6ca9b1e14c5305707c6d29c8e58e7c4
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index e4f47917ec..594940ca10 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1886,6 +1886,7 @@ void msg_puts_attr_len(const char *const str, const ptrdiff_t len, int attr) // wait-return prompt later. Needed when scrolling, resetting // need_wait_return after some prompt, and then outputting something // without scrolling + // Not needed when only using CR to move the cursor. bool overflow = false; if (ui_has(kUIMessages)) { int count = msg_ext_visible + (msg_ext_overwrite ? 0 : 1); @@ -1897,7 +1898,7 @@ void msg_puts_attr_len(const char *const str, const ptrdiff_t len, int attr) overflow = msg_scrolled != 0; } - if (overflow && !msg_scrolled_ign) { + if (overflow && !msg_scrolled_ign && strcmp(str, "\r") != 0) { need_wait_return = true; } msg_didany = true; // remember that something was outputted |