diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-08-20 13:13:49 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-08-20 13:13:49 +0000 |
| commit | 647674f6abe8e6fd01bb115af88b43304ab00025 (patch) | |
| tree | e0d41c1a185226345a17ed6068fa3fc5d2e8d3b5 /Src/Zle/compcore.c | |
| parent | 62451960a01a5818d99f00475b933f12f66fe0fb (diff) | |
| download | zsh-647674f6abe8e6fd01bb115af88b43304ab00025.tar.gz zsh-647674f6abe8e6fd01bb115af88b43304ab00025.zip | |
undo most of 15650, do that in shell code (15669)
Diffstat (limited to 'Src/Zle/compcore.c')
| -rw-r--r-- | Src/Zle/compcore.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index f75c8dc20..d3f720478 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -1782,23 +1782,21 @@ addmatches(Cadata dat, char **argv) } else lsl = 0; if (dat->aflags & CAF_MATCH) { - int ml, gfl = 0, tildepat = 0; + int ml, gfl = 0; char *globflag = NULL; if (comppatmatch && *comppatmatch && - lpre[0] == '(' && lpre[1] == '#') { + dat->ppre && lpre[0] == '(' && lpre[1] == '#') { char *p; for (p = lpre + 2; *p && *p != ')'; p++); - if (*p == ')' && (dat->ppre || p[1] == '~')) { + if (*p == ')') { char sav = p[1]; p[1] = '\0'; globflag = dupstring(lpre); gfl = p - lpre + 1; - if (!dat->ppre) - tildepat = 1; p[1] = sav; lpre = p + 1; @@ -1861,11 +1859,7 @@ addmatches(Cadata dat, char **argv) int is = (*comppatmatch == '*'); char *tmp = (char *) zhalloc(2 + llpl + llsl + gfl); - if (tildepat) { - tmp[0] = '~'; - strcpy(tmp + 1, globflag); - strcat(tmp, lpre + 1); - } else if (gfl) { + if (gfl) { strcpy(tmp, globflag); strcat(tmp, lpre); } else |