_urls -f

[Oliver Kiddle <okiddle@xxxxxxxxxxx>]

I don't like the behaviour of _urls -f in that it completes files before
urls without letting you define a style to complete both together or
urls first.

The patch below is what I would suggest here. Note that _urls is not
called with -f from anywhere other than _webbrowser and anything which
did could always call _webbrowser directly instead anyway (_netscape may
have to).

Any user preferring the current behaviour could get it back with a
style. e.g:
    zstyle ':completion::complete:galeon:*' tag-order files urls

Any views?

Oliver

Index: Completion/Unix/Command/_webbrowser
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_webbrowser,v
retrieving revision 1.2
diff -u -r1.2 _webbrowser
--- Completion/Unix/Command/_webbrowser	2001/10/08 16:22:40	1.2
+++ Completion/Unix/Command/_webbrowser	2001/12/11 17:14:51
@@ -1,3 +1,3 @@
-#compdef amaya arena chimera express grail gzilla hotjava mmm mozilla opera www xmosaic Mosaic galeon
+#compdef amaya arena chimera express grail gzilla hotjava mmm mozilla opera www xmosaic Mosaic galeon konqueror
 
-_urls -f
+_alternative 'files:file:_files' 'urls:url:_urls'
Index: Completion/Unix/Type/_urls
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_urls,v
retrieving revision 1.2
diff -u -r1.2 _urls
--- Completion/Unix/Type/_urls	2001/10/08 16:22:40	1.2
+++ Completion/Unix/Type/_urls	2001/12/11 17:14:51
@@ -1,9 +1,5 @@
 #compdef curl
 
-# Usage: _urls [-f]
-# Options:
-#  -f : complete files first.
-#
 # Configuration styles used:
 #
 #  urls
@@ -48,11 +44,6 @@
 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 @@
 
   _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)

_____________________________________________________________________
This message has been checked for all known viruses by the 
MessageLabs Virus Scanning Service. For further information visit
http://www.messagelabs.com/stats.asp