about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@zsh.org>2016-04-14 15:52:44 +0200
committerOliver Kiddle <opk@zsh.org>2016-04-14 15:52:44 +0200
commitc7eead3950d3d53dd0c4012b272aef024f7a4ea3 (patch)
tree1d76aec7879d3226683f03b120efcbddc79dc9e3
parentfbe2763411db0efd2e0ee36bb851842ce0f00d4a (diff)
downloadzsh-c7eead3950d3d53dd0c4012b272aef024f7a4ea3.tar.gz
zsh-c7eead3950d3d53dd0c4012b272aef024f7a4ea3.tar.xz
zsh-c7eead3950d3d53dd0c4012b272aef024f7a4ea3.zip
38286: cursor correction following yank-pop is only applicable to vi command mode
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_misc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17a3aae11..f58749919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-14  Oliver Kiddle  <opk@zsh.org>
+
+	* 38286: Src/Zle/zle_misc.c: cursor correction following
+	yank-pop is only applicable to vi command mode
+
 	* Christian Neukirchen: 37847: Completion/Unix/Command/_du:
 	update du arguments up to GNU du 8.25
 
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index 25f65b39c..a040ca0df 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -597,7 +597,7 @@ static void pastebuf(Cutbuffer buf, int mult, int position)
 	    zlecs += cc;
 	}
 	yanke = zlecs;
-	if (zlecs)
+	if (zlecs && invicmdmode())
 	    DECCS();
     }
 }