diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/Zle/compmatch.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 6eb800b4e..16844bafe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2000-10-10 Sven Wischnowsky <wischnow@zsh.org> - * 12942: Completion/Core/_expand: temporarily remove global + * 12942,12945: Completion/Core/_expand: temporarily remove global aliases to avoid error message inside the evals * 12941: Src/Zle/compmatch.c: follow-up to 12930, make it first diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index d7a8e8e73..c43140774 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -843,6 +843,9 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, he = 0; } else { + if (!lw) + break; + if (exact) { /* If we just accepted some characters directly (at the * beginning of the loop) and now can't match any further, @@ -858,9 +861,6 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, goto retry; } - - if (!lw) - break; /* No matcher and different characters: l does not match w. */ if (test) return 0; |