diff options
author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-11 10:42:15 +0000 |
---|---|---|
committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-11 10:42:15 +0000 |
commit | 0c918c63ca81f3c63cdefde4b7f6ff5a6a0e2dfd (patch) | |
tree | 163a2a8b00c6b5837ed74e2617bd2153a89aff56 | |
parent | 3d0f90ba2b52aa93b9176362c3f1d479f21f220f (diff) | |
download | zsh-0c918c63ca81f3c63cdefde4b7f6ff5a6a0e2dfd.tar.gz zsh-0c918c63ca81f3c63cdefde4b7f6ff5a6a0e2dfd.tar.xz zsh-0c918c63ca81f3c63cdefde4b7f6ff5a6a0e2dfd.zip |
make _oldlist ignore old list when _complete_help is used (10648)
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Completion/Core/_oldlist | 4 |
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) ]] && |