about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/compcore.c3
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)