about summary refs log tree commit diff
path: root/Completion/Base/Core/_all_labels
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2002-02-12 13:37:00 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2002-02-12 13:37:00 +0000
commit77339cc21d723eed88e6e621d831ba28c6110b6d (patch)
tree0b828157c049d01ebb4a5fdd6b01bdf75ef2304c /Completion/Base/Core/_all_labels
parent50758ce645d3c0e9c0e3d18e96c13638537cd4f6 (diff)
downloadzsh-77339cc21d723eed88e6e621d831ba28c6110b6d.tar.gz
zsh-77339cc21d723eed88e6e621d831ba28c6110b6d.tar.xz
zsh-77339cc21d723eed88e6e621d831ba28c6110b6d.zip
add -x option (to be passed on to compadd) to _description and friends; make _message respect any -[12VJ] options it gets, adding the message to that group (16609)
Diffstat (limited to 'Completion/Base/Core/_all_labels')
-rw-r--r--Completion/Base/Core/_all_labels12
1 files changed, 5 insertions, 7 deletions
diff --git a/Completion/Base/Core/_all_labels b/Completion/Base/Core/_all_labels
index 8665f5bf3..9dda58131 100644
--- a/Completion/Base/Core/_all_labels
+++ b/Completion/Base/Core/_all_labels
@@ -1,16 +1,14 @@
 #autoload
 
-local __gopt=-J __len __tmp __pre __suf __ret=1 __descr __spec __prev
+local __gopt __len __tmp __pre __suf __ret=1 __descr __spec __prev
 
 if [[ "$1" = - ]]; then
   __prev=-
   shift
 fi
 
-if [[ "$1" = -([12]|)[VJ] ]]; then
-  __gopt="$1"
-  shift
-fi
+__gopt=()
+zparseopts -D -a __gopt 1 2 V J x
 
 __tmp=${argv[(ib:4:)-]}
 __len=$#
@@ -29,12 +27,12 @@ while comptags "-A$__prev" "$1" curtag __spec; do
   _comp_tags="$_comp_tags $__spec "
   if [[ "$curtag" = *[^\\]:* ]]; then
     zformat -f __descr "${curtag#*:}" "d:$3"
-    _description "$__gopt" "${curtag%:*}" "$2" "$__descr"
+    _description "$__gopt[@]" "${curtag%:*}" "$2" "$__descr"
     curtag="${curtag%:*}"
 
     "$4" "${(P@)2}" "${(@)argv[5,-1]}" && __ret=0
   else
-    _description "$__gopt" "$curtag" "$2" "$3"
+    _description "$__gopt[@]" "$curtag" "$2" "$3"
 
     "${(@)argv[4,__pre]}" "${(P@)2}" "${(@)argv[__suf,-1]}" && __ret=0
   fi