summaryrefslogtreecommitdiff
path: root/Completion/Zsh/Context/_subscript
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2016-12-04 04:32:03 +0100
committerAxel Beckert <abe@deuxchevaux.org>2016-12-04 04:32:03 +0100
commit3e439c3863f14c82f70666804c8570a13b3732e6 (patch)
tree07036c43e0f3f9242bb6dd42cd2a849ec8ea8aca /Completion/Zsh/Context/_subscript
parent2aedc4b88fd0e87b89583983951b04b96f48efd3 (diff)
parent7b7e84f0815ed22a0ee348a217776529035dccf3 (diff)
downloadzsh-3e439c3863f14c82f70666804c8570a13b3732e6.tar.gz
zsh-3e439c3863f14c82f70666804c8570a13b3732e6.zip
Merge tag 'zsh-5.2-test-1' into debian
Diffstat (limited to 'Completion/Zsh/Context/_subscript')
-rw-r--r--Completion/Zsh/Context/_subscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/Completion/Zsh/Context/_subscript b/Completion/Zsh/Context/_subscript
index 0ccc0c4ef..0c9a89ad5 100644
--- a/Completion/Zsh/Context/_subscript
+++ b/Completion/Zsh/Context/_subscript
@@ -62,6 +62,7 @@ elif compset -P '\('; then
'e[interpret * or @ as a single key]'
);;
(|scalar*)) flags=(
+ 'f[make subscripting work on lines of scalar]'
'w[make subscripting work on words of scalar]'
's[specify word separator]'
'p[recognise escape sequences in subsequent s flag]'
@@ -81,8 +82,8 @@ elif compset -P '\('; then
elif [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then
local suf MATCH MBEGIN MEND
local -a keys
- keys=(${${(kP)compstate[parameter]}//(#m)[\$\\\[\]\(\)\[\{\}]/\\$MATCH})
- keys=(${keys//#%(#m)[*@]/(e)$MATCH})
+ keys=("${(@)${(@k)${(P)compstate[parameter]}}//(#m)[\$\\\[\]\(\)\{\}]/\\$MATCH}")
+ keys=("${(@)keys//#%(#m)[*@]/(e)$MATCH}")
[[ "$RBUFFER" != (|\\)\]* ]] && suf="$osuf"
_wanted association-keys expl 'association key' \
@@ -99,10 +100,9 @@ elif [[ ${(Pt)${compstate[parameter]}} = array* ]]; then
list=()
for i in "$ind[@]"; do
if [[ "$i" = ${PREFIX}*${SUFFIX} ]]; then
- list=( "$list[@]"
- "${i}:$(print -D ${(P)${compstate[parameter]}[$i]})" )
+ list+=( "${i}:$(print -D -- ${(P)${compstate[parameter]}[$i]})" )
else
- list=( "$list[@]" '' )
+ list+=( '' )
fi
done
zstyle -s ":completion:${curcontext}:indexes" list-separator sep || sep=--