about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGammaFunction <GammaFunction@vivaldi.net>2021-01-27 10:04:40 +0000
committerPeter Stephenson <p.stephenson@samsung.com>2021-01-27 10:04:40 +0000
commit5d14b6eb71b51911a1083b1c5882f3b3307e9d1b (patch)
tree940e97d603cc091eb8c03adb2d77a87844ef5b18
parente15dce8cedb09d10ced54015d766ba5de3d5da13 (diff)
downloadzsh-5d14b6eb71b51911a1083b1c5882f3b3307e9d1b.tar.gz
zsh-5d14b6eb71b51911a1083b1c5882f3b3307e9d1b.tar.xz
zsh-5d14b6eb71b51911a1083b1c5882f3b3307e9d1b.zip
47744: Fix vi repeats with hooks in use.
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_main.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cf9d09291..4d4548e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-27  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* GammaFunction@vivaldi.net via Roman: 47744:
+	Src/Zle/zle_main.c: Fix vi-repeat-change when hooks are in use.
+
 2021-01-26  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* unposted: Etc/FAQ.yo: Fix a typo in the front matter.
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 8c0534708..0561c3b3b 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1065,6 +1065,7 @@ redrawhook(void)
 	int saverrflag = errflag, savretflag = retflag;
 	int lastcmd_prev = lastcmd;
 	int old_incompfunc = incompfunc;
+	int old_viinrepeat = viinrepeat;
 	char *args[2];
 	Thingy lbindk_save = lbindk, bindk_save = bindk;
 
@@ -1079,6 +1080,7 @@ redrawhook(void)
 	incompfunc = 0;
 	execzlefunc(initthingy, args, 1, 0);
 	incompfunc = old_incompfunc;
+	viinrepeat = old_viinrepeat;
 
 	/* Restore errflag and retflag as zlecallhook() does */
 	errflag = saverrflag | (errflag & ERRFLAG_INT);