mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-01-01 05:16:05 +01:00
26116: didn't get updated properly for combining characters
This commit is contained in:
parent
2ac5a8cdcb
commit
9503eaee5a
1 changed files with 5 additions and 6 deletions
|
@ -44,11 +44,10 @@ deltochar(UNUSED(char **args))
|
|||
if (n > 0) {
|
||||
while (n-- && dest != zlell) {
|
||||
while (dest != zlell && (ZLE_INT_T)zleline[dest] != c)
|
||||
dest++;
|
||||
INCPOS(dest);
|
||||
if (dest != zlell) {
|
||||
/* HERE adjust dest for trailing combining chars */
|
||||
if (!zap || n > 0)
|
||||
INCCS();
|
||||
INCPOS(dest);
|
||||
if (!n) {
|
||||
forekill(dest - zlecs, CUT_RAW);
|
||||
ok++;
|
||||
|
@ -58,10 +57,10 @@ deltochar(UNUSED(char **args))
|
|||
} else {
|
||||
/* ignore character cursor is on when scanning backwards */
|
||||
if (dest)
|
||||
dest--;
|
||||
DECPOS(dest);
|
||||
while (n++ && dest != 0) {
|
||||
while (dest != 0 && (ZLE_INT_T)zleline[dest] != c)
|
||||
dest--;
|
||||
DECPOS(dest);
|
||||
if ((ZLE_INT_T)zleline[dest] == c) {
|
||||
if (!n) {
|
||||
/* HERE adjust zap for trailing combining chars */
|
||||
|
@ -69,7 +68,7 @@ deltochar(UNUSED(char **args))
|
|||
ok++;
|
||||
}
|
||||
if (dest)
|
||||
dest--;
|
||||
DECPOS(dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue