summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/Zle/zle_tricky.c8
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e1f660e98..0d16be700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-14 Peter Stephenson <pws@csr.com>
+
+ * 24810 (slightly edited to move added text later):
+ Src/Zle/zle_tricky.c: after unmetafying the command line ensure
+ we're not on a combining character.
+
2008-04-13 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 24808: Doc/Zsh/options.yo, Src/options.c, Src/utils.c, Src/zsh.h,
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index e8e14cf14..8223c7046 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -980,6 +980,14 @@ unmetafy_line(void)
free(zlemetaline);
zlemetaline = NULL;
+
+#ifdef MULTIBYTE_SUPPORT
+ /*
+ * If we inserted combining characters under the cursor we
+ * won't have tested the effect yet. So fix it up now.
+ */
+ alignmultiwordright(1);
+#endif
}
/* Free a brinfo list. */