diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-17 14:44:51 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-17 14:44:51 +0000 |
| commit | 493876e0c7669b1185af83e99a7a3345793d628c (patch) | |
| tree | 056c614ff6b4236df596057c86ef086885c0d043 /Src/Zle | |
| parent | 9aa1735b63b733f062f4061975d8fa65252dee18 (diff) | |
| download | zsh-493876e0c7669b1185af83e99a7a3345793d628c.tar.gz zsh-493876e0c7669b1185af83e99a7a3345793d628c.tar.xz zsh-493876e0c7669b1185af83e99a7a3345793d628c.zip | |
zsh-workers/9777
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/compctl.c | 8 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index f3673df52..dc9f46b0f 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -2219,7 +2219,7 @@ gen_matches_files(int dirs, int execs, int all) /* Do the globbing... */ remnulargs(p); addlinknode(l, p); - globlist(l); + globlist(l, 0); /* And see if that produced a filename. */ tt = nonempty(l); while (ugetnode(l)); @@ -3334,7 +3334,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) tokenize(p); remnulargs(p); addlinknode(l, p); - globlist(l); + globlist(l, 0); if (nonempty(l)) { /* And add the resulting words. */ @@ -3483,7 +3483,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) /* Do the globbing. */ ng = opts[NULLGLOB]; opts[NULLGLOB] = 1; - globlist(l); + globlist(l, 0); opts[NULLGLOB] = ng; /* Get the results. */ if (nonempty(l) && peekfirst(l)) { @@ -3679,7 +3679,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) /* Fine, now do full expansion. */ prefork(foo, 0); if (!errflag) { - globlist(foo); + globlist(foo, 0); if (!errflag) /* And add the resulting words as matches. */ for (n = firstnode(foo); n; incnode(n)) diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 6964c9c04..079611015 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1612,11 +1612,11 @@ doexpansion(char *s, int lst, int olst, int explincmd) prefork(vl, 0); if (errflag) goto end; - if ((lst == COMP_LIST_EXPAND) || (lst == COMP_EXPAND)) { + if (lst == COMP_LIST_EXPAND || lst == COMP_EXPAND) { int ng = opts[NULLGLOB]; opts[NULLGLOB] = 1; - globlist(vl); + globlist(vl, 1); opts[NULLGLOB] = ng; } if (errflag) @@ -1645,11 +1645,14 @@ doexpansion(char *s, int lst, int olst, int explincmd) foredel(we - wb); while ((ss = (char *)ugetnode(vl))) { ret = 0; - untokenize(ss); ss = quotename(ss, NULL); + untokenize(ss); inststr(ss); +#if 0 if (olst != COMP_EXPAND_COMPLETE || nonempty(vl) || (cs && line[cs-1] != '/')) { +#endif + if (nonempty(vl)) { spaceinline(1); line[cs++] = ' '; } |