aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-09-20 20:54:07 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-09-20 21:01:00 +0800
commit2e4532bea50e5f6fb68ebf750c461c5704fc58c2 (patch)
tree32211d325eb5e35ab4dcef48e75520982a30a1bf /src
parent9413f7544bcab6951f9a0c26c4b2e1a6dc477c82 (diff)
downloadrneovim-2e4532bea50e5f6fb68ebf750c461c5704fc58c2.tar.gz
rneovim-2e4532bea50e5f6fb68ebf750c461c5704fc58c2.tar.bz2
rneovim-2e4532bea50e5f6fb68ebf750c461c5704fc58c2.zip
vim-patch:9.0.0512: cannot redraw the status lines when editing a command
Problem: Cannot redraw the status lines when editing a command. Solution: Only postpone the redraw when messages have scrolled. (closes vim/vim#11170) https://github.com/vim/vim/commit/c14bfc31d907cbee6a3636f780561ad1787cdb9b
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_docmd.c2
-rw-r--r--src/nvim/testdir/test_cmdline.vim7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 8390760b55..534cc6dcfb 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6094,7 +6094,7 @@ static void ex_redrawstatus(exarg_T *eap)
} else {
status_redraw_curbuf();
}
- if (State & MODE_CMDLINE) {
+ if (msg_scrolled) {
return; // redraw later
}
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index faf68d038e..9fc92b8f25 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -152,15 +152,20 @@ func Test_redrawstatus_in_autocmd()
CheckScreendump
let lines =<< trim END
- set cmdheight=2
+ set laststatus=2
+ set statusline=%=:%{getcmdline()}
autocmd CmdlineChanged * if getcmdline() == 'foobar' | redrawstatus | endif
END
call writefile(lines, 'XTest_redrawstatus', 'D')
let buf = RunVimInTerminal('-S XTest_redrawstatus', {'rows': 8})
+ " :redrawstatus is postponed if messages have scrolled
call term_sendkeys(buf, ":echo \"one\\ntwo\\nthree\\nfour\"\<CR>")
call term_sendkeys(buf, ":foobar")
call VerifyScreenDump(buf, 'Test_redrawstatus_in_autocmd_1', {})
+ " it is not postponed if messages have not scrolled
+ call term_sendkeys(buf, "\<Esc>:foobar")
+ call VerifyScreenDump(buf, 'Test_redrawstatus_in_autocmd_2', {})
" clean up
call term_sendkeys(buf, "\<CR>")