about summary refs log tree commit diff
path: root/Src/Zle
diff options
context:
space:
mode:
authorAndrey Borzenkov <bor@users.sourceforge.net>2006-09-30 06:53:15 +0000
committerAndrey Borzenkov <bor@users.sourceforge.net>2006-09-30 06:53:15 +0000
commit21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a (patch)
treec3d1e33f89123ffccf342f47cf5fa8dc99d976aa /Src/Zle
parent85fd642711877cfffc1de8f7a007a185765af942 (diff)
downloadzsh-21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a.tar.gz
zsh-21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a.tar.xz
zsh-21c1e9a34649dc5c3b36bc90b2a3199bc9a2557a.zip
fix thinko in 22787
Diffstat (limited to 'Src/Zle')
-rw-r--r--Src/Zle/compmatch.c3
1 files changed, 2 insertions, 1 deletions
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;