about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Core/_oldlist4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2ef402b1..9b5c6250b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-11  Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
 
+	* 10648: Completion/Core/_oldlist: make _oldlist ignore old list
+ 	when _complete_help is used
+	
 	* 10641: Completion/Core/_approximate, Completion/Core/_match,
  	Completion/Core/_oldlist: make _oldlist ignore list from
  	_complete_help; _match runs for every match spec from
diff --git a/Completion/Core/_oldlist b/Completion/Core/_oldlist
index e28a66d83..04e952655 100644
--- a/Completion/Core/_oldlist
+++ b/Completion/Core/_oldlist
@@ -14,7 +14,7 @@ zstyle -s ":completion:${curcontext}:" old-list list
 # completer named by the oldlist_list key.
 
 if [[ -n $compstate[old_list] && $list != never &&
-      $LASTWIDGET != _complete_help ]]; then
+      $LASTWIDGET != _complete_help && $WIDGET != _complete_help ]]; then
   if [[ $WIDGET = *list* && ( $list = always || $list != shown ) ]]; then
     compstate[old_list]=keep
     return 0
@@ -35,7 +35,7 @@ fi
 # existing list (even if it was generated by another widget).
 
 if [[ -z $compstate[old_insert] && -n $compstate[old_list] &&
-      $LASTWIDGET != _complete_help ]]; then
+      $LASTWIDGET != _complete_help && $WIDGET != _complete_help ]]; then
   compstate[old_list]=keep
   return 0
 elif [[ $WIDGET = *complete(|-prefix|-word) ]] &&