From 3d0f90ba2b52aa93b9176362c3f1d479f21f220f Mon Sep 17 00:00:00 2001 From: Sven Wischnowsky Date: Tue, 11 Apr 2000 09:40:13 +0000 Subject: make _oldlist ignore list from _complete_help; _match runs for every match spec from matcher-list; _approximate doesn't redefine compadd if that is already a function (10641) --- Completion/Core/_oldlist | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Completion/Core/_oldlist') diff --git a/Completion/Core/_oldlist b/Completion/Core/_oldlist index bcb3e148a..e28a66d83 100644 --- a/Completion/Core/_oldlist +++ b/Completion/Core/_oldlist @@ -13,7 +13,8 @@ zstyle -s ":completion:${curcontext}:" old-list list # Do this also if there is an old list and it was generated by the # completer named by the oldlist_list key. -if [[ -n $compstate[old_list] && $list != never ]]; then +if [[ -n $compstate[old_list] && $list != never && + $LASTWIDGET != _complete_help ]]; then if [[ $WIDGET = *list* && ( $list = always || $list != shown ) ]]; then compstate[old_list]=keep return 0 @@ -33,8 +34,10 @@ fi # and the style :oldlist:old-menu is `true', then we cycle through the # existing list (even if it was generated by another widget). -if [[ -z $compstate[old_insert] && -n $compstate[old_list] ]]; then +if [[ -z $compstate[old_insert] && -n $compstate[old_list] && + $LASTWIDGET != _complete_help ]]; then compstate[old_list]=keep + return 0 elif [[ $WIDGET = *complete(|-prefix|-word) ]] && zstyle -t ":completion:${curcontext}:" old-menu; then if [[ -n $compstate[old_insert] ]]; then -- cgit 1.4.1