about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-09-22 18:37:49 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-09-22 18:37:49 +0000
commit9ae36771fe34d764aa63d0ca65bae1e3970af4fd (patch)
tree2e07957a6f0e79b483b0f24e4415c71f9b69ad97
parent86873c3efcf092891908ba1a0bf0bfbfb0eedd21 (diff)
downloadzsh-9ae36771fe34d764aa63d0ca65bae1e3970af4fd.tar.gz
zsh-9ae36771fe34d764aa63d0ca65bae1e3970af4fd.tar.xz
zsh-9ae36771fe34d764aa63d0ca65bae1e3970af4fd.zip
25723: align combining character when popped from input stack
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_main.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2839b1732..1b0049306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-22  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 25723: Src/Zle/zle_main.c: align combining character when
+	retrieved from input stack.
+
 2008-09-22  Clint Adams  <clint@zsh.org>
 
 	* 25721: Src/exec.c: revert another mistake of 25701.
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index dc6e07f2b..9e2edb956 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1173,6 +1173,7 @@ zleread(char **lp, char **rp, int flags, int context)
 	    stackcs = -1;
 	    if (zlecs > zlell)
 		zlecs = zlell;
+	    CCLEFT();
 	}
 	if (stackhist != -1) {
 	    histline = stackhist;