diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-15 09:07:09 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-15 09:07:09 +0000 |
| commit | e6cc1ece7fed93fd31ca4e7f7726de034ede887c (patch) | |
| tree | 93087d3edf5eb27836ba9bbdfb687b416fb7c629 /Completion/Base | |
| parent | bf990125d18effbf111fd6a30ff5bf90c4c263ae (diff) | |
| download | zsh-e6cc1ece7fed93fd31ca4e7f7726de034ede887c.tar.gz zsh-e6cc1ece7fed93fd31ca4e7f7726de034ede887c.tar.xz zsh-e6cc1ece7fed93fd31ca4e7f7726de034ede887c.zip | |
zsh-workers/9731
Diffstat (limited to 'Completion/Base')
| -rw-r--r-- | Completion/Base/_arguments | 7 | ||||
| -rw-r--r-- | Completion/Base/_describe | 2 | ||||
| -rw-r--r-- | Completion/Base/_jobs | 4 | ||||
| -rw-r--r-- | Completion/Base/_subscript | 2 | ||||
| -rw-r--r-- | Completion/Base/_tilde | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index ddd9d4c06..50c368b11 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -17,9 +17,8 @@ if (( long )); then fi name=${~words[1]} - if [[ "$name" != /* ]]; then - tmp="$PWD/$name" - fi + [[ "$name" != /* ]] && tmp="$PWD/$name" + name="_args_cache_${name}" name="${name//[^a-zA-Z0-9_]/_}" @@ -255,7 +254,7 @@ if (( $# )) && comparguments -i "$autod" "$@"; then fi if [[ -z "$matched" ]] && _requested options && - { ! zstyle -t ":completion:${curcontext}:options" prefix-needed || + { ! zstyle -T ":completion:${curcontext}:options" prefix-needed || [[ "$origpre" = [-+]* || ( -z "$aret$mesg" && nm -eq compstate[nmatches] ) ]] } ; then local prevpre="$PREFIX" previpre="$IPREFIX" diff --git a/Completion/Base/_describe b/Completion/Base/_describe index 684385d13..986d27c4e 100644 --- a/Completion/Base/_describe +++ b/Completion/Base/_describe @@ -16,7 +16,7 @@ fi _tags "$_type" || return 1 -zstyle -t ":completion:${curcontext}:$_type" verbose && _showd=yes +zstyle -T ":completion:${curcontext}:$_type" verbose && _showd=yes _description "$_type" _expl "$1" shift diff --git a/Completion/Base/_jobs b/Completion/Base/_jobs index fc2f3d87f..6c4154d6f 100644 --- a/Completion/Base/_jobs +++ b/Completion/Base/_jobs @@ -5,12 +5,12 @@ local expl disp jobs job jids pfx='%' desc how _tags jobs || return 1 if [[ "$1" = -t ]]; then - zstyle -t ":completion:${curcontext}:jobs" prefix-needed && + zstyle -T ":completion:${curcontext}:jobs" prefix-needed && [[ "$PREFIX" != %* && compstate[nmatches] -ne 0 ]] && return 1 shift fi zstyle -t ":completion:${curcontext}:jobs" prefix-hidden && pfx='' -zstyle -t ":completion:${curcontext}:jobs" verbose && desc=yes +zstyle -T ":completion:${curcontext}:jobs" verbose && desc=yes if [[ "$1" = -r ]]; then jids=( "${(@k)jobstates[(R)running*]}" ) diff --git a/Completion/Base/_subscript b/Completion/Base/_subscript index b74fe795d..5917c8234 100644 --- a/Completion/Base/_subscript +++ b/Completion/Base/_subscript @@ -21,7 +21,7 @@ elif [[ ${(Pt)${compstate[parameter]}} = array* ]]; then while _tags; do if _requested -V indexes expl 'array index'; then ind=( {1..${#${(P)${compstate[parameter]}}}} ) - if zstyle -t ":completion:${curcontext}:indexes" verbose; then + if zstyle -T ":completion:${curcontext}:indexes" verbose; then list=() for i in "$ind[@]"; do [[ "$i" = ${PREFIX}*${SUFFIX} ]] && diff --git a/Completion/Base/_tilde b/Completion/Base/_tilde index 35621d9d3..98e9d2c00 100644 --- a/Completion/Base/_tilde +++ b/Completion/Base/_tilde @@ -22,9 +22,9 @@ while _tags; do compadd "$suf[@]" "$expl[@]" "$@" - "${(@k)nameddirs}" if _requested -V directory-stack expl 'directory stack' && - { ! zstyle -t ":completion:${curcontext}:directory-stack" prefix-needed || + { ! zstyle -T ":completion:${curcontext}:directory-stack" prefix-needed || [[ "$PREFIX" = [-+]* || nm -eq compstate[nmatches] ]] }; then - if zstyle -t ":completion:${curcontext}:directory-stack" verbose; then + if zstyle -T ":completion:${curcontext}:directory-stack" verbose; then integer i lines=("${PWD}" "${dirstack[@]}") |