diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-03-05 10:48:10 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-03-05 10:48:10 +0000 |
| commit | eb41692bc56f22c7587426c4e5fa3c75ea0dfeab (patch) | |
| tree | 92f164f7f014503fe24f8b3ff65688c273c4e296 /Src/Zle/compresult.c | |
| parent | d7e0081a67988fe139539d745a14dda4094e125a (diff) | |
| download | zsh-eb41692bc56f22c7587426c4e5fa3c75ea0dfeab.tar.gz zsh-eb41692bc56f22c7587426c4e5fa3c75ea0dfeab.tar.xz zsh-eb41692bc56f22c7587426c4e5fa3c75ea0dfeab.zip | |
fix for matching control, try harder to merge separately completed parts to avoid losing user-typed characters (13565)
Diffstat (limited to 'Src/Zle/compresult.c')
| -rw-r--r-- | Src/Zle/compresult.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index b2c240188..9b85948f9 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -253,7 +253,7 @@ cline_str(Cline l, int ins, int *csp, LinkList posl) opos = npos; addlinknode(posl, (void *) ((long) npos)); } - if (((pmax < (l->max - l->min) || (pma && l->max != l->min)) && + if (((pmax <= (l->max - l->min) || (pma && l->max != l->min)) && (!pmm || (l->flags & CLF_MATCHED))) || ((l->flags & CLF_MATCHED) && !pmm)) { pm = cs; pmax = l->max - l->min; pmm = l->flags & CLF_MATCHED; @@ -307,7 +307,7 @@ cline_str(Cline l, int ins, int *csp, LinkList posl) opos = npos; addlinknode(posl, (void *) ((long) npos)); } - if (((smax < (l->min - l->max) || (sma && l->max != l->min)) && + if (((smax <= (l->min - l->max) || (sma && l->max != l->min)) && (!smm || (l->flags & CLF_MATCHED))) || ((l->flags & CLF_MATCHED) && !smm)) { sm = cs; smax = l->min - l->max; smm = l->flags & CLF_MATCHED; |