diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-01-13 18:50:12 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-01-13 18:50:12 +0000 |
| commit | 6a81d6f4d34ca5343bccc376b41722342477b3e2 (patch) | |
| tree | cb45eace1bdd71a1999fdedbf1261732edfeac81 /Src/Zle | |
| parent | 8476e86d2d8117c3b30671034a1f5e4a6a414fe1 (diff) | |
| download | zsh-6a81d6f4d34ca5343bccc376b41722342477b3e2.tar.gz zsh-6a81d6f4d34ca5343bccc376b41722342477b3e2.tar.xz zsh-6a81d6f4d34ca5343bccc376b41722342477b3e2.zip | |
zsh-3.1.6-dev-15 zsh-3.1.6-dev-15
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/compcore.c | 8 | ||||
| -rw-r--r-- | Src/Zle/zle_thingy.c | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 4d7ee469b..028536206 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -2569,11 +2569,9 @@ permmatches(int last) static int fi = 0; int nn, nl, ll, gn = 1, mn = 1, rn; - if (pmatches && !newmatches) { - if (last && fi) - ainfo = fainfo; + if (pmatches && !newmatches) return fi; - } + newmatches = fi = 0; if (pmatches) @@ -2589,7 +2587,7 @@ permmatches(int last) } while (g) { HEAPALLOC { - if (fi) + if (empty(g->lmatches)) /* We have no matches, try ignoring fignore. */ mlist = g->lfmatches; else diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c index 86f0f4f1d..dd990cbdc 100644 --- a/Src/Zle/zle_thingy.c +++ b/Src/Zle/zle_thingy.c @@ -337,7 +337,6 @@ bin_zle(char *name, char **args, char *ops, int func) { 'N', bin_zle_new, 1, 2 }, { 'C', bin_zle_complete, 3, 3 }, { 'R', bin_zle_refresh, 0, -1 }, - { 'M', bin_zle_mesg, 1, 1 }, { 'U', bin_zle_unget, 1, 1 }, { 0, bin_zle_call, 0, -1 }, }; @@ -432,14 +431,6 @@ bin_zle_refresh(char *name, char **args, char *ops, char func) /**/ static int -bin_zle_mesg(char *name, char **args, char *ops, char func) -{ - showmsg(*args); - return 0; -} - -/**/ -static int bin_zle_unget(char *name, char **args, char *ops, char func) { char *p = *args; |