summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2002-01-07 14:43:40 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2002-01-07 14:43:40 +0000
commitba968d10de8be0c8dcef4e652dd97e25fc495553 (patch)
treefd686a986c5991485bc5aae4352feeded80480c8
parent540618a4fbb7f4f1245fcee86e6f8470fe12b3e3 (diff)
downloadzsh-ba968d10de8be0c8dcef4e652dd97e25fc495553.tar.gz
zsh-ba968d10de8be0c8dcef4e652dd97e25fc495553.tar.xz
zsh-ba968d10de8be0c8dcef4e652dd97e25fc495553.zip
make sure auto menu isn't started accidentially when bashautolist is set (16408)
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/compcore.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 310405d26..3e121ba87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-07  Sven Wischnowsky  <wischnow@zsh.org>
 
+	* 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)