From ba968d10de8be0c8dcef4e652dd97e25fc495553 Mon Sep 17 00:00:00 2001 From: Sven Wischnowsky Date: Mon, 7 Jan 2002 14:43:40 +0000 Subject: make sure auto menu isn't started accidentially when bashautolist is set (16408) --- ChangeLog | 3 +++ Src/Zle/compcore.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 310405d26..3e121ba87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-01-07 Sven Wischnowsky + * 16408: Src/Zle/compcore.c: make sure auto menu isn't started + accidentially when bashautolist is set + * 16407: Completion/X/Command/_netscape: fix nested _tags-loops by re-initialising the outer one when leaving the inner one diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 8127fcd5d..7db5ffd13 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) -- cgit v1.3