about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Core/_main_complete8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2271fef02..06ad5d3b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-22  Sven Wischnowsky  <wischnow@zsh.org>
 
+	* 11497: Completion/Core/_main_complete: fix for select-long-list
+ 	in menu style
+	
 	* 11496: Src/Zle/compmatch.c: fix for clines in suffix
 	
 	* 11493: Completion/Core/_main_complete, Doc/Zsh/compwid.yo,
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete
index 260e5b63f..bb10706d8 100644
--- a/Completion/Core/_main_complete
+++ b/Completion/Core/_main_complete
@@ -159,9 +159,9 @@ if [[ $compstate[old_list] = keep || nm -gt 1 ]]; then
 
   _menu_style=( "$_menu_style[@]" "$_def_menu_style[@]" )
 
-  if [[ -z "$compstate[insert]" ]]; then
-    [[ -n "$_menu_style[(r)select=long-list]" && tmp -gt LINES ]] &&
-        compstate[insert]=menu
+  if [[ "$compstate[list]" = *list &&
+        -n "$_menu_style[(r)select=long-list]" && tmp -gt LINES ]]; then
+    compstate[insert]=menu
   elif [[ "$compstate[insert]" = "$_saved_insert" ]]; then
     if [[ -n "$_menu_style[(r)select=long]" && tmp -gt LINES ]]; then
         compstate[insert]=menu
@@ -185,7 +185,7 @@ if [[ $compstate[old_list] = keep || nm -gt 1 ]]; then
       compstate[insert]=unambiguous
     fi
   fi
-set -x
+
   if [[ "$compstate[insert]" = *menu* ]]; then
     if [[ -n "$_menu_style[(r)no-select*]" ]]; then
       unset MENUSELECT