mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-13 11:21:13 +02:00
Code Releases Activity

small fix for _requested to be able to use _all_labels from within it (10910)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-04-25 11:00:06 +00:00
parent 6623bb41b9
commit 2f90974c38
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2000-04-25 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> 2000-04-25 Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
* 10910: Completion/Base/_tilde, Completion/Core/_all_labels,
Completion/Core/_requested: small fix for _requested to be able to
use _all_labels from within it
* 10909: Completion/Core/_expand, Src/Zle/compcore.c, * 10909: Completion/Core/_expand, Src/Zle/compcore.c,
Src/Zle/compresult.c: report prefix/suffix of parameter expansion Src/Zle/compresult.c: report prefix/suffix of parameter expansion
in IPREFIX/ISUFFIX; make _expand use them to be able to expand $foo in IPREFIX/ISUFFIX; make _expand use them to be able to expand $foo

1
Completion/Base/_tilde
View file

@ -18,6 +18,7 @@ _tags users named-directories directory-stack
while _tags; do while _tags; do
_requested users && _users "$suf[@]" "$@" && ret=0 _requested users && _users "$suf[@]" "$@" && ret=0
_requested named-directories expl 'named directory' \ _requested named-directories expl 'named directory' \
compadd "$suf[@]" "$@" - "${(@k)nameddirs}" compadd "$suf[@]" "$@" - "${(@k)nameddirs}"

9
Completion/Core/_all_labels
View file

@ -1,6 +1,11 @@
#autoload #autoload
local gopt=-J len tmp pre suf ret=1 descr spec local gopt=-J len tmp pre suf ret=1 descr spec prev
if [[ "$1" = - ]]; then
prev=-
shift
fi
if [[ "$1" = -([12]|)[VJ] ]]; then if [[ "$1" = -([12]|)[VJ] ]]; then
gopt="$1" gopt="$1"
@ -20,7 +25,7 @@ else
suf=5 suf=5
fi fi
while comptags -A "$1" curtag spec; do while comptags "-A$prev" "$1" curtag spec; do
_comp_tags="$_comp_tags $spec " _comp_tags="$_comp_tags $spec "
if [[ "$curtag" = *:* ]]; then if [[ "$curtag" = *:* ]]; then
zformat -f descr "${curtag#*:}" "d:$3" zformat -f descr "${curtag#*:}" "d:$3"

2
Completion/Core/_requested
View file

@ -9,7 +9,7 @@ fi
if comptags -R "$1"; then if comptags -R "$1"; then
if [[ $# -gt 3 ]]; then if [[ $# -gt 3 ]]; then
_all_labels "$gopt" "$@" _all_labels - "$gopt" "$@"
elif [[ $# -gt 1 ]]; then elif [[ $# -gt 1 ]]; then
_description "$gopt" "$@" _description "$gopt" "$@"
fi fi