summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_vi.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 503eb4575..a5ac3713e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-02  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 39811: Src/Zle/zle_vi.c: vi-repeat-change must not be the
+	"motion" of vi-change, lest it infinitely repeat itself.
+
 2016-11-01  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* 39731: Completion/Unix/Command/_awk: add support for gawk
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
index baa2064e9..1e0402dff 100644
--- a/Src/Zle/zle_vi.c
+++ b/Src/Zle/zle_vi.c
@@ -780,7 +780,7 @@ int
 virepeatchange(UNUSED(char **args))
 {
     /* make sure we have a change to repeat */
-    if (!vichgbuf || vichgflag)
+    if (!vichgbuf || vichgflag || virangeflag)
 	return 1;
     /* restore or update the saved count and buffer */
     if (zmod.flags & MOD_MULT) {