about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarc Finet <m.dreadlock@gmail.com>2014-11-27 23:04:04 +0100
committerPeter Stephenson <pws@zsh.org>2014-11-28 09:40:24 +0000
commit2598010adfea1d0e42f4e2fa393290ded423cf60 (patch)
tree01d23c3930d95b5da729a8e65d9b2453efff0a78
parent8080ca3a87049951acea497f2af8e8d6feafb966 (diff)
downloadzsh-2598010adfea1d0e42f4e2fa393290ded423cf60.tar.gz
zsh-2598010adfea1d0e42f4e2fa393290ded423cf60.tar.xz
zsh-2598010adfea1d0e42f4e2fa393290ded423cf60.zip
33815: Fix word transposition bug.
With a one-character word the wrong two words could be transposed.
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_word.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 37c129996..30076722e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-28  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 33815: Src/Zle/zle_word.c: fix word transposition bug where
+	wrong words could be transposed.
+
 2014-11-27  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 33805: Doc/Zsh/params.yo: rewrite intro, tweak formatting
diff --git a/Src/Zle/zle_word.c b/Src/Zle/zle_word.c
index 301b18d4a..cb5e5dbe5 100644
--- a/Src/Zle/zle_word.c
+++ b/Src/Zle/zle_word.c
@@ -690,7 +690,6 @@ transposewords(UNUSED(char **args))
 	    DECPOS(pos);
 	    if (zleline[pos] == ZWC('\n'))
 		return 1;
-	    x = pos;
 	}
 	for (p4 = x; p4 != zlell && ZC_iword(zleline[p4]); INCPOS(p4))
 	    ;