diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2002-02-10 17:24:06 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2002-02-10 17:24:06 +0000 |
| commit | 9ea4c8104c463b68006cda6a5204e72bc5d88d36 (patch) | |
| tree | d94f7dc6630d23787754c67fb79c9f18428fb4f2 | |
| parent | 806422526890259d0eb0571a18cff4a1fb823eb5 (diff) | |
| download | zsh-9ea4c8104c463b68006cda6a5204e72bc5d88d36.tar.gz zsh-9ea4c8104c463b68006cda6a5204e72bc5d88d36.tar.xz zsh-9ea4c8104c463b68006cda6a5204e72bc5d88d36.zip | |
Sven: 16408: Src/Zle/compcore.c: make sure auto menu isn't started
accidentially when bashautolist is set
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 48323edf7..8152277a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-10 Clint Adams <clint@zsh.org> + + * Sven: 16408: Src/Zle/compcore.c: make sure auto menu + isn't started accidentially when bashautolist is set + 2002-02-09 Clint Adams <clint@zsh.org> * unposted: Functions/Prompts/prompt_clint_setup: improve APM and diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 94cb914d8..3ea9e8c4c 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -842,7 +842,8 @@ callcompfunc(char *s, char *fn) } startauto = ((compinsert && !strcmp(compinsert, "automenu-unambiguous")) || - (bashlistfirst && (!compinsert || !*compinsert))); + (bashlistfirst && isset(AUTOMENU) && + (!compinsert || !*compinsert))); useexact = (compexact && !strcmp(compexact, "accept")); if (!comptoend || !*comptoend) |