From 4d89ec25f17712e8e1710727a7ca211c5591d9e9 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Mon, 3 Nov 2014 00:31:57 +0100
Subject: 33575: reset vi change start position if text is inserted before it
 or on history movement

---
 Src/Zle/zle_utils.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Src/Zle/zle_utils.c')

diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c
index 46d5373fb..741f119d2 100644
--- a/Src/Zle/zle_utils.c
+++ b/Src/Zle/zle_utils.c
@@ -785,6 +785,8 @@ spaceinline(int ct)
 
 	if (mark > zlecs)
 	    mark += ct;
+	if (viinsbegin > zlecs)
+	    viinsbegin = 0;
 
 	if (region_highlights) {
 	    for (rhp = region_highlights + N_SPECIAL_HIGHLIGHTS;
@@ -1104,6 +1106,7 @@ setline(char *s, int flags)
      */
     free(zleline);
 
+    viinsbegin = 0;
     zleline = stringaszleline(scp, 0, &zlell, &linesz, NULL);
 
     if ((flags & ZSL_TOEND) && (zlecs = zlell) && invicmdmode())
-- 
cgit 1.4.1