From f125ca3293802426a41715f73b35f66f7f045252 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Mon, 14 Apr 2008 09:13:18 +0000 Subject: 24810: ensure combining character alignment on unmetafication --- ChangeLog | 6 ++++++ Src/Zle/zle_tricky.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index e1f660e98..0d16be700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-14 Peter Stephenson + + * 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 * 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. */ -- cgit 1.4.1