patch 8.2.4789: cursor pos wrong when using :redraw while editing the cmdline
Problem: The cursor may be in the in wrong place when using :redraw while
editing the cmdline.
Solution: When editing the command line let :redraw update the command line
too. (closes #10210)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 58df97a..5c86cee 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8323,6 +8323,10 @@
// No need to wait after an intentional redraw.
need_wait_return = FALSE;
+ // When invoked from a callback or autocmd the command line may be active.
+ if (State & CMDLINE)
+ redrawcmdline();
+
out_flush();
}
diff --git a/src/testdir/dumps/Test_redraw_in_autocmd_1.dump b/src/testdir/dumps/Test_redraw_in_autocmd_1.dump
new file mode 100644
index 0000000..8939b70
--- /dev/null
+++ b/src/testdir/dumps/Test_redraw_in_autocmd_1.dump
@@ -0,0 +1,8 @@
+| +0&#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|:+0#0000000&|f|o|r| |i| |i|n| |r|a|n|g|e|(|3|)| @56
+|:| @1> @71
diff --git a/src/testdir/dumps/Test_redraw_in_autocmd_2.dump b/src/testdir/dumps/Test_redraw_in_autocmd_2.dump
new file mode 100644
index 0000000..17b7e04
--- /dev/null
+++ b/src/testdir/dumps/Test_redraw_in_autocmd_2.dump
@@ -0,0 +1,8 @@
+| +0&#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|:+0#0000000&| @1|l|e|t| |i| |=> @64
+@75
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 8baa1ac..8d556fa 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -193,6 +193,28 @@
call delete('XTest_wildmenu')
endfunc
+func Test_redraw_in_autocmd()
+ CheckScreendump
+
+ let lines =<< trim END
+ set cmdheight=2
+ autocmd CmdlineChanged * redraw
+ END
+ call writefile(lines, 'XTest_redraw')
+
+ let buf = RunVimInTerminal('-S XTest_redraw', {'rows': 8})
+ call term_sendkeys(buf, ":for i in range(3)\<CR>")
+ call VerifyScreenDump(buf, 'Test_redraw_in_autocmd_1', {})
+
+ call term_sendkeys(buf, "let i =")
+ call VerifyScreenDump(buf, 'Test_redraw_in_autocmd_2', {})
+
+ " clean up
+ call term_sendkeys(buf, "\<CR>")
+ call StopVimInTerminal(buf)
+ call delete('XTest_redraw')
+endfunc
+
func Test_map_completion()
call feedkeys(":map <unique> <si\<Tab>\<Home>\"\<CR>", 'xt')
call assert_equal('"map <unique> <silent>', getreg(':'))
diff --git a/src/version.c b/src/version.c
index 411ea1a..b837fcb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4789,
+/**/
4788,
/**/
4787,