diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-18 09:46:07 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-18 09:46:07 +0000 |
| commit | 437294af796f2c1530ef942f53c823ba0753556f (patch) | |
| tree | 0ed0cf72a78272e2da5fb8ccca1d131a9c3f2ddd /Src | |
| parent | b852c1f6cf50aaa37c9d2e8cbeb63f74b9e5d01f (diff) | |
| download | zsh-437294af796f2c1530ef942f53c823ba0753556f.tar.gz zsh-437294af796f2c1530ef942f53c823ba0753556f.tar.xz zsh-437294af796f2c1530ef942f53c823ba0753556f.zip | |
zsh-workers/8313
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Zle/zle_tricky.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 70371b41c..dd11c2d28 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -4118,23 +4118,6 @@ addmatches(Cadata dat, char **argv) llpl -= pl; lpre += pl; } - if (comppatmatch && *comppatmatch) { - int is = (*comppatmatch == '*'); - char *tmp = (char *) zhalloc(2 + llpl + llsl); - - strcpy(tmp, lpre); - tmp[llpl] = 'x'; - strcpy(tmp + llpl + is, lsuf); - - tokenize(tmp); - remnulargs(tmp); - if (haswilds(tmp)) { - if (is) - tmp[llpl] = Star; - if ((cp = patcompile(tmp, 0, NULL))) - haspattern = 1; - } - } } /* Now duplicate the strings we have from the command line. */ if (dat->ipre) @@ -4196,6 +4179,23 @@ addmatches(Cadata dat, char **argv) else *argv = NULL; } + if (comppatmatch && *comppatmatch) { + int is = (*comppatmatch == '*'); + char *tmp = (char *) zhalloc(2 + llpl + llsl); + + strcpy(tmp, lpre); + tmp[llpl] = 'x'; + strcpy(tmp + llpl + is, lsuf); + + tokenize(tmp); + remnulargs(tmp); + if (haswilds(tmp)) { + if (is) + tmp[llpl] = Star; + if ((cp = patcompile(tmp, 0, NULL))) + haspattern = 1; + } + } } if (*argv) { if (dat->pre) |