summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Src/Zle/zle_keymap.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 758604da1..e6b43936e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2025-11-17 Oliver Kiddle <opk@zsh.org>
+ * 54083: Src/Zle/zle_keymap.c: fix for cursor shape in viopp mode
+
* 54075: Doc/Zsh/prompt.yo, Src/Modules/watch.c, Src/Zle/complist.c,
Src/Zle/zle_tricky.c, Src/prompt.c: allow highlighting to be reset
in prompts using %H without following braces
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index 95a60bcc2..ea80f9e3c 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -1623,8 +1623,13 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp)
/* can be patient with vi commands that need a motion operator: *
* they wait till a key is pressed for the movement anyway */
- timeout = !(!virangeflag && !region_active && f && f->widget &&
- f->widget->flags & ZLE_VIOPER);
+ if (!(timeout = !(!virangeflag && !region_active && f && f->widget &&
+ f->widget->flags & ZLE_VIOPER))) {
+ int nochg = vichgflag;
+ vichgflag = 2;
+ cursor_form();
+ vichgflag = nochg;
+ }
#ifdef MULTIBYTE_SUPPORT
if ((f == Th(z_selfinsert) || f == Th(z_selfinsertunmeta)) &&
!lastchar_wide_valid && !ispfx) {