mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-09-22 11:51:04 +02:00
allow tag-order to select order of files and urls (16330)
This commit is contained in:
parent
5cf4508f42
commit
aed1bad64a
@ -1,6 +1,13 @@
|
||||
2001-12-12 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* 16330: Completion/X/Command/_netscape,
|
||||
Completion/Unix/Command/_lynx, Completion/Unix/Command/_links,
|
||||
Completion/Unix/Command/_w3m: allow tag-order to select order of
|
||||
files and urls instead of files first
|
||||
|
||||
2001-12-11 Clint Adams <clint@zsh.org>
|
||||
|
||||
* 16326: Completion/Debian/Command/_dpkg:
|
||||
* 16327: Completion/Debian/Command/_dpkg:
|
||||
glob for udebs as well as debs.
|
||||
|
||||
* 16326: Completion/Unix/Command/_webbrowser,
|
||||
|
@ -24,8 +24,6 @@ _arguments -C \
|
||||
'-help' \
|
||||
':url:->html' && return 0
|
||||
|
||||
case "$state" in
|
||||
html)
|
||||
_files -g '*.html' || _urls
|
||||
;;
|
||||
esac
|
||||
if [[ "$state" = html ]]; then
|
||||
_alternative 'files:file:_files "*.html"' 'urls:url:_urls'
|
||||
fi
|
||||
|
@ -107,6 +107,6 @@ restrictions)
|
||||
outside_telnet print shell suspend telnet_port useragent
|
||||
;;
|
||||
html)
|
||||
_files -g '*.html' || _urls
|
||||
_alternative 'files:file:_files "*.html"' 'urls:url:_urls'
|
||||
;;
|
||||
esac
|
||||
|
@ -42,7 +42,7 @@ case $state in
|
||||
compadd $_w3mhistory
|
||||
fi
|
||||
|
||||
_urls || _files -g '*.html'
|
||||
_alternative 'files:file:_files "*.html"' 'urls:url:_urls'
|
||||
;;
|
||||
|
||||
esac
|
||||
|
@ -24,9 +24,6 @@ _x_arguments -C \
|
||||
-{component-bar,composer,edit,messenger,mail,discussions,news} \
|
||||
'*:location:->urls' && ret=0
|
||||
|
||||
[[ "$state" = "urls" ]] &&
|
||||
_files "$@" && return 0
|
||||
|
||||
# Handle netscape remote commands
|
||||
if [[ "$state" = "remote" ]]; then
|
||||
local -a remote_commands
|
||||
@ -69,24 +66,31 @@ if [[ "$state" = "remote" ]]; then
|
||||
fi
|
||||
|
||||
if [[ "$state" = "urls" ]]; then
|
||||
# Complete netscape urls
|
||||
if compset -P about: ; then
|
||||
_wanted values expl 'about what' \
|
||||
compadd "$@" authors blank cache document fonts global hype image-cache \
|
||||
license logo memory-cache mozilla plugins && ret=0
|
||||
elif compset -P news: ; then
|
||||
_newsgroups "$@" && ret=0
|
||||
else
|
||||
_tags prefixes
|
||||
while _tags; do
|
||||
while _next_label prefixes expl 'URL prefix' "$@"; do
|
||||
_urls "$expl[@]" && ret=0
|
||||
compset -S '[^:]*'
|
||||
compadd -S '' "$expl[@]" about: news: mocha: javascript: && ret=0
|
||||
done
|
||||
(( ret )) || return 0
|
||||
done
|
||||
fi
|
||||
_tags files urls
|
||||
while _tags; do
|
||||
_requested files expl 'file' _files "$@" && ret=0
|
||||
if _requested urls; then
|
||||
# Complete netscape urls
|
||||
if compset -P about: ; then
|
||||
_wanted values expl 'about what' \
|
||||
compadd "$@" authors blank cache document fonts global hype \
|
||||
image-cache license logo memory-cache mozilla plugins && ret=0
|
||||
elif compset -P news: ; then
|
||||
_newsgroups "$@" && ret=0
|
||||
else
|
||||
_tags prefixes
|
||||
while _tags; do
|
||||
while _next_label prefixes expl 'URL prefix' "$@"; do
|
||||
_urls "$expl[@]" && ret=0
|
||||
compset -S '[^:]*'
|
||||
compadd -S '' "$expl[@]" about: news: mocha: javascript: && ret=0
|
||||
done
|
||||
(( ret )) || return 0
|
||||
done
|
||||
fi
|
||||
fi
|
||||
(( ret )) || return 0
|
||||
done
|
||||
fi
|
||||
|
||||
return ret
|
||||
|
Loading…
Reference in New Issue
Block a user