summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_webbrowser2
-rw-r--r--Completion/Unix/Type/_urls11
3 files changed, 6 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fae33a17..f227fafa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 2001-12-12  Oliver Kiddle  <opk@zsh.org>
 
-	* 16330: Completion/X/Command/_netscape, 
+	* 16323, 16330: Completion/Unix/Command/_webbrowser,
+	Completion/Unix/Type/_urls, 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
+	Completion/Unix/Command/_w3m: allow tag-order to select order
+	of files and urls instead being fixed to files first
 
 2001-12-11  Clint Adams  <clint@zsh.org>
 
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)