diff options
Diffstat (limited to 'Completion/Base')
-rw-r--r-- | Completion/Base/_arguments | 10 | ||||
-rw-r--r-- | Completion/Base/_combination | 4 | ||||
-rw-r--r-- | Completion/Base/_describe | 4 | ||||
-rw-r--r-- | Completion/Base/_first | 2 | ||||
-rw-r--r-- | Completion/Base/_jobs | 8 | ||||
-rw-r--r-- | Completion/Base/_subscript | 2 | ||||
-rw-r--r-- | Completion/Base/_tilde | 4 | ||||
-rw-r--r-- | Completion/Base/_values | 8 |
8 files changed, 21 insertions, 21 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index fe98240ce..1a5fd10f5 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -162,7 +162,7 @@ while [[ "$1" = -(O*|C) ]]; do esac done -zstyle -s ":completion${curcontext}:options" auto-description autod +zstyle -s ":completion:${curcontext}:options" auto-description autod if (( $# )) && comparguments -i "$autod" "$@"; then local nm="$compstate[nmatches]" action noargs aret expl local @@ -172,7 +172,7 @@ if (( $# )) && comparguments -i "$autod" "$@"; then if comparguments -D descr action; then comparguments -C subc - curcontext="${oldcontext}:$subc" + curcontext="${oldcontext%:*}:$subc" if comparguments -O next direct odirect equal; then opts=yes @@ -201,7 +201,7 @@ if (( $# )) && comparguments -i "$autod" "$@"; then comparguments -W line opt_args state="${${action[3,-1]##[ ]#}%%[ ]#}" if [[ -n "$usecc" ]]; then - curcontext="${oldcontext}:$subc" + curcontext="${oldcontext%:*}:$subc" else context="$subc" fi @@ -259,7 +259,7 @@ if (( $# )) && comparguments -i "$autod" "$@"; then fi if [[ -z "$matched$mesg" ]] && _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" @@ -320,7 +320,7 @@ if (( $# )) && comparguments -i "$autod" "$@"; then matched=yes comparguments -L "${equal[1]%%:*}" descr action subc - curcontext="${oldcontext}:$subc" + curcontext="${oldcontext%:*}:$subc" _tags arguments diff --git a/Completion/Base/_combination b/Completion/Base/_combination index 0f9673b06..875d3c2cb 100644 --- a/Completion/Base/_combination +++ b/Completion/Base/_combination @@ -11,7 +11,7 @@ # Assume an user sets the style `hosts-ports-users' as for the my-accounts # tag: # -# zstyle ':completion:*:telnet*:my-accounts' hosts-ports-users \ +# zstyle ':completion:*:*:telnet:*:my-accounts' hosts-ports-users \ # host0:: host1::user1 host2::user2 # mail-server:{smtp,pop3}: # news-server:nntp: @@ -78,7 +78,7 @@ key="${1%:*}" num="${${1##*:}:-1}" shift -if zstyle -a ":completion${curcontext}:$tag" "$style" tmp; then +if zstyle -a ":completion:${curcontext}:$tag" "$style" tmp; then eval "tmp=( \"\${(@M)tmp:#\${(j($sep))~pats}}\" )" if (( keys[(in:num:)$key] != 1 )); then eval "tmp=( \${tmp#\${(j(${sep}))~\${(@)\${(@)keys[2,(rn:num:)\$key]}/*/*}}$sep} )" diff --git a/Completion/Base/_describe b/Completion/Base/_describe index 1db7e6fb6..684385d13 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 @@ -28,7 +28,7 @@ else fi [[ "$_type" = options ]] && - zstyle -t ":completion${curcontext}:options" prefix-hidden && _hide=yes + zstyle -t ":completion:${curcontext}:options" prefix-hidden && _hide=yes while compdescribe -g _args _tmpd _tmpmd _tmps _tmpms; do diff --git a/Completion/Base/_first b/Completion/Base/_first index f81ab465e..566cfc785 100644 --- a/Completion/Base/_first +++ b/Completion/Base/_first @@ -50,7 +50,7 @@ # # We first search in the last ten words, then in the last # # twenty words, and so on... # while [[ i -le max ]]; do -# if zstyle -t ":completion${curcontext}:history-words" sort; then +# if zstyle -t ":completion:${curcontext}:history-words" sort; then # _description history-words expl "history ($n)" # else # _description -V history-words expl "history ($n)" diff --git a/Completion/Base/_jobs b/Completion/Base/_jobs index e12410f99..fc2f3d87f 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" prefix-hidden && pfx='' +zstyle -t ":completion:${curcontext}:jobs" verbose && desc=yes if [[ "$1" = -r ]]; then jids=( "${(@k)jobstates[(R)running*]}" ) @@ -34,7 +34,7 @@ if [[ -n "$desc" ]]; then done fi -zstyle -s ":completion${curcontext}:jobs" numbers how +zstyle -s ":completion:${curcontext}:jobs" numbers how if [[ "$how" = (yes|true|on|1) ]]; then jobs=( "$jids[@]" ) diff --git a/Completion/Base/_subscript b/Completion/Base/_subscript index fdda19301..b74fe795d 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 128fd7ffa..35621d9d3 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[@]}") diff --git a/Completion/Base/_values b/Completion/Base/_values index 7b174bc58..e8004ba6f 100644 --- a/Completion/Base/_values +++ b/Completion/Base/_values @@ -20,7 +20,7 @@ if compvalues -i "$@"; then _tags values || return 1 - curcontext="${oldcontext}:values" + curcontext="${oldcontext%:*}:values" compvalues -V noargs args opts @@ -47,7 +47,7 @@ if compvalues -i "$@"; then SUFFIX="$suffix" IPREFIX="${IPREFIX}${args[1]%%:*}=" compvalues -L "${args[1]%%:*}" descr action subc - curcontext="${oldcontext}:$subc" + curcontext="${oldcontext%:*}:$subc" fi else compvalues -d descr @@ -68,7 +68,7 @@ if compvalues -i "$@"; then fi else compvalues -C subc - curcontext="${oldcontext}:$subc" + curcontext="${oldcontext%:*}:$subc" fi if ! _tags arguments; then @@ -88,7 +88,7 @@ if compvalues -i "$@"; then compvalues -v val_args state="${${action[3,-1]##[ ]#}%%[ ]#}" if [[ -n "$usecc" ]]; then - curcontext="$subc" + curcontext="${oldcontext%:*}:$subc" else context="$subc" fi |