patch 9.1.0543: Behavior of CursorMovedC is strange
Commit:
https://github.com/vim/vim/commit/8145620a958dbb5c82cf8f8a37556ee1ea501c6d
Author: zeertzjq <zeert...@outlook.com>
Date: Sun Jul 7 20:48:25 2024 +0200
patch 9.1.0543: Behavior of CursorMovedC is strange
Problem: Behavior of CursorMovedC is strange.
Solution: Also trigger when the cmdline has changed.
(zeertzjq)
fixes: #15069
closes: #15071
Signed-off-by: zeertzjq <zeert...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 34e9535db..a5dce7db8 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 9.1. Last change: 2024 Jul 06
+*autocmd.txt* For Vim version 9.1. Last change: 2024 Jul 07
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -751,9 +751,8 @@ CursorMoved After the cursor was moved in
Normal or Visual
that is slow.
*CursorMovedC*
CursorMovedC After the cursor was moved in the command
- line while the text in the command line hasn't
- changed. Be careful not to mess up the
- command line, it may cause Vim to lock up.
+ line. Be careful not to mess up the command
+ line, it may cause Vim to lock up.
<afile> is set to a single character,
indicating the type of command-line.
|cmdwin-char|
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 51a38e583..1b3a699a2 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2480,13 +2480,13 @@ cmdline_not_changed:
trigger_cmd_autocmd(cmdline_type, EVENT_CURSORMOVEDC);
prev_cmdpos = ccline.cmdpos;
}
+
#ifdef FEAT_SEARCH_EXTRA
if (!is_state.incsearch_postponed)
continue;
#endif
cmdline_changed:
- prev_cmdpos = ccline.cmdpos;
#ifdef FEAT_SEARCH_EXTRA
// If the window changed incremental search state is not valid.
if (is_state.winid != curwin->w_id)
@@ -2496,6 +2496,13 @@ cmdline_changed:
if (trigger_cmdlinechanged)
trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINECHANGED);
+ // Trigger CursorMovedC autocommands.
+ if (ccline.cmdpos != prev_cmdpos)
+ {
+ trigger_cmd_autocmd(cmdline_type, EVENT_CURSORMOVEDC);
+ prev_cmdpos = ccline.cmdpos;
+ }
+
#ifdef FEAT_SEARCH_EXTRA
if (xpc.xp_context == EXPAND_NOTHING && (KeyTyped || vpeekc() == NUL))
may_do_incsearch_highlighting(firstc, count, &is_state);
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 371abcbd7..bcbddf978 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2099,21 +2099,30 @@ func Test_Cmdline()
au! CursorMovedC : let g:pos += [getcmdpos()]
let g:pos = []
+ call feedkeys(":foo bar baz\<C-W>\<C-W>\<C-W>\<Esc>", 'xt')
+ call assert_equal([2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 9, 5, 1], g:pos)
+ let g:pos = []
+ call feedkeys(":hello\<C-B>\<Esc>", 'xt')
+ call assert_equal([2, 3, 4, 5, 6, 1], g:pos)
+ let g:pos = []
+ call feedkeys(":hello\<C-U>\<Esc>", 'xt')
+ call assert_equal([2, 3, 4, 5, 6, 1], g:pos)
+ let g:pos = []
call feedkeys(":hello\<Left>\<C-R>=''\<CR>\<Left>\<Right>\<Esc>", 'xt')
- call assert_equal([5, 4, 5], g:pos)
+ call assert_equal([2, 3, 4, 5, 6, 5, 4, 5], g:pos)
let g:pos = []
call feedkeys(":12345678\<C-R>=setcmdpos(3)??''\<CR>\<Esc>", 'xt')
- call assert_equal([3], g:pos)
+ call assert_equal([2, 3, 4, 5, 6, 7, 8, 9, 3], g:pos)
let g:pos = []
call feedkeys(":12345678\<C-R>=setcmdpos(3)??''\<CR>\<Left>\<Esc>", 'xt')
- call assert_equal([3, 2], g:pos)
+ call assert_equal([2, 3, 4, 5, 6, 7, 8, 9, 3, 2], g:pos)
au! CursorMovedC
" setcmdpos() is no-op inside an autocommand
au! CursorMovedC : let g:pos += [getcmdpos()] | call setcmdpos(1)
let g:pos = []
call feedkeys(":hello\<Left>\<Left>\<Esc>", 'xt')
- call assert_equal([5, 4], g:pos)
+ call assert_equal([2, 3, 4, 5, 6, 5, 4], g:pos)
au! CursorMovedC
unlet g:entered
diff --git a/src/version.c b/src/version.c
index dffc63c1f..6f7c2c05f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 543,
/**/
542,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sQX7L-009BHh-IK%40256bit.org.
