summaryrefslogtreecommitdiff
path: root/Completion/Unix
diff options
context:
space:
mode:
Diffstat (limited to 'Completion/Unix')
-rw-r--r--Completion/Unix/Command/_webbrowser2
-rw-r--r--Completion/Unix/Type/_urls11
2 files changed, 2 insertions, 11 deletions
diff --git a/Completion/Unix/Command/_webbrowser b/Completion/Unix/Command/_webbrowser
index bde1372be..13055dbff 100644
--- a/Completion/Unix/Command/_webbrowser
+++ b/Completion/Unix/Command/_webbrowser
@@ -1,3 +1,3 @@
#compdef amaya arena chimera express grail gzilla hotjava mmm opera www xmosaic Mosaic galeon konqueror skipstone light dillo
-_urls -f
+_alternative 'files:file:_files' 'urls:url:_urls'
diff --git a/Completion/Unix/Type/_urls b/Completion/Unix/Type/_urls
index 63ab0e7c1..32b994c76 100644
--- a/Completion/Unix/Type/_urls
+++ b/Completion/Unix/Type/_urls
@@ -1,9 +1,5 @@
#compdef curl
-# Usage: _urls [-f]
-# Options:
-# -f : complete files first.
-#
# Configuration styles used:
#
# urls
@@ -48,11 +44,6 @@ local localhttp_servername="$localhttp[1]"
local localhttp_documentroot="$localhttp[2]"
local localhttp_userdir="$localhttp[3]"
-if [[ "$1" = -f ]]; then
- shift
- _wanted -C -f files expl file _files "$@" && return 0
-fi
-
zstyle -a ":completion:${curcontext}:urls" urls urls
if [[ $#urls -gt 1 || ( $#urls -eq 1 && ! -d $urls[1] ) ]]; then
@@ -134,7 +125,7 @@ if ! compset -P '(#b)([^:/]#)([:/])'; then
_tags hosts
while _tags; do
- while _next_label hosts expl host "$@"; do
+ while _next_label hosts expl host; do
compset -S '[:/]*' || suf="/"
(( $#uhosts )) || _hosts -S "$suf" -r '/:' "$expl[@]" && ret=0
[[ "$scheme" = http ]] && uhosts=($uhosts $localhttp_servername)