diff options
| author | Andrey Borzenkov <bor@users.sourceforge.net> | 2006-09-30 06:53:15 +0000 |
|---|---|---|
| committer | Andrey Borzenkov <bor@users.sourceforge.net> | 2006-09-30 06:53:15 +0000 |
| commit | 21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a (patch) | |
| tree | c3d1e33f89123ffccf342f47cf5fa8dc99d976aa | |
| parent | 85fd642711877cfffc1de8f7a007a185765af942 (diff) | |
| download | zsh-21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a.tar.gz zsh-21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a.tar.xz zsh-21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a.zip | |
fix thinko in 22787
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/Zle/compmatch.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0986ee59f..b20d3e23b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-30 Andrey Borzenkov <bor@zsh.org> + + * unposted: Src/Zle/compmatch.c: fix thinko in 22787 that changed + semantic of pattern matching in join_strs + 2006-09-29 Vin Shelton <acs@xemacs.org> * 22789: Src/init.c: Source zshenv even if non-interactive. @@ -5,7 +10,7 @@ 2006-09-29 Andrey Borzenkov <bor@zsh.org> * 22787: Srz/Zsh/compmatch.c: change calling convention of - pattern match to not depend on current implementation that works + pattern_match to not depend on current implementation that works for single byte characters only, thus making it more easy to change it later. diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 8bed574e3..41448c13e 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -1341,7 +1341,8 @@ join_strs(int la, char *sa, int lb, char *sb) mp->wlen <= la && mp->wlen <= lb) { /* The pattern has no anchors and the word * pattern fits, try it. */ - if ((t = pattern_match(mp->word, sa, mp->word, sb))) { + if ((t = pattern_match(mp->word, sa, NULL, NULL)) || + pattern_match(mp->word, sb, NULL, NULL)) { /* It matched one of the strings, t says which one. */ VARARR(char, line, mp->llen + 1); char **ap, **bp; |