diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2004-09-16 14:46:50 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2004-09-16 14:46:50 +0000 |
| commit | 53383c33b80061c8d651dde7e554d68395b48899 (patch) | |
| tree | 9ec58f5366469550e5c6250895f4524eb3661058 | |
| parent | 1268f477b0d88ff10b7de4dea33b53b29cbed287 (diff) | |
| download | zsh-53383c33b80061c8d651dde7e554d68395b48899.tar.gz zsh-53383c33b80061c8d651dde7e554d68395b48899.tar.xz zsh-53383c33b80061c8d651dde7e554d68395b48899.zip | |
20364: use $WIDGETSTYLE in _oldlist
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Base/Completer/_oldlist | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 94ce16d70..d621b771b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-09-16 Peter Stephenson <pws@csr.com> + + * 20364: Functions/Completer/_oldlist: use $WIDGETSTYLE. + 2004-09-13 Peter Stephenson <pws@csr.com> * 20363: Src/init.c, Src/Zle/zle_main.c: exiting after 10 EOFs diff --git a/Completion/Base/Completer/_oldlist b/Completion/Base/Completer/_oldlist index 3ece0b7ca..1cb376027 100644 --- a/Completion/Base/Completer/_oldlist +++ b/Completion/Base/Completer/_oldlist @@ -15,7 +15,7 @@ zstyle -s ":completion:${curcontext}:" old-list list if [[ -n $compstate[old_list] && $list != never && $LASTWIDGET != _complete_help && $WIDGET != _complete_help ]]; then - if [[ $WIDGET = *list* && ( $list = always || $list != shown ) ]]; then + if [[ $WIDGETSTYLE = *list* && ( $list = always || $list != shown ) ]]; then compstate[old_list]=keep return 0 elif [[ $list = *${_lastcomp[completer]}* ]]; then @@ -39,11 +39,11 @@ if [[ -z $compstate[old_insert] && -n $compstate[old_list] && $LASTWIDGET != _complete_help && $WIDGET != _complete_help ]]; then compstate[old_list]=keep return 0 -elif [[ $WIDGET = *complete(|-prefix|-word) ]] && +elif [[ $WIDGETSTYLE = *complete(|-prefix|-word) ]] && zstyle -T ":completion:${curcontext}:" old-menu; then if [[ -n $compstate[old_insert] ]]; then compstate[old_list]=keep - if [[ $WIDGET = *reverse* ]]; then + if [[ $WIDGETSTYLE = *reverse* ]]; then compstate[insert]=$(( compstate[old_insert] - 1 )) else compstate[insert]=$(( compstate[old_insert] + 1 )) |