From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Tanaka Akira <akr@m17n.org>
Cc: zsh-workers@sunsite.dk
Subject: Re: _urls -f
Date: Wed, 12 Dec 2001 11:24:27 +0000 [thread overview]
Message-ID: <3C173E6B.251ACAD4@yahoo.co.uk> (raw)
In-Reply-To: <hvo7krtkqdv.fsf@coulee.a02.aist.go.jp>
Tanaka Akira wrote:
> Oliver Kiddle <okiddle@yahoo.co.uk> writes:
> > 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.
>
> Agreed. I think it was my fault.
Good, I'll apply that then. Here's the patch to make the same change
for netscape, links, lynx and w3m.
For netscape, a tag-order of urls before files doesn't seem to work
entirely so I think I'm still misunderstanding the tags stuff there
somewhere.
Oliver
Index: Completion/Unix/Command/_links
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_links,v
retrieving revision 1.1
diff -u -r1.1 _links
--- Completion/Unix/Command/_links 2001/08/22 21:37:00 1.1
+++ Completion/Unix/Command/_links 2001/12/12 11:22:08
@@ -24,8 +24,6 @@
'-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
Index: Completion/Unix/Command/_lynx
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_lynx,v
retrieving revision 1.1
diff -u -r1.1 _lynx
--- Completion/Unix/Command/_lynx 2001/04/02 11:56:16 1.1
+++ Completion/Unix/Command/_lynx 2001/12/12 11:22:08
@@ -107,6 +107,6 @@
outside_telnet print shell suspend telnet_port useragent
;;
html)
- _files -g '*.html' || _urls
+ _alternative 'files:file:_files "*.html"' 'urls:url:_urls'
;;
esac
Index: Completion/Unix/Command/_w3m
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_w3m,v
retrieving revision 1.2
diff -u -r1.2 _w3m
--- Completion/Unix/Command/_w3m 2001/05/03 13:05:49 1.2
+++ Completion/Unix/Command/_w3m 2001/12/12 11:22:09
@@ -42,7 +42,7 @@
compadd $_w3mhistory
fi
- _urls || _files -g '*.html'
+ _alternative 'files:file:_files "*.html"' 'urls:url:_urls'
;;
esac
Index: Completion/X/Command/_netscape
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/X/Command/_netscape,v
retrieving revision 1.1
diff -u -r1.1 _netscape
--- Completion/X/Command/_netscape 2001/04/02 12:14:25 1.1
+++ Completion/X/Command/_netscape 2001/12/12 11:22:09
@@ -24,9 +24,6 @@
-{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 @@
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
_____________________________________________________________________
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
next prev parent reply other threads:[~2001-12-12 11:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-12-11 17:17 Oliver Kiddle
2001-12-11 17:28 ` Clint Adams
2001-12-12 4:34 ` Tanaka Akira
2001-12-12 11:24 ` Oliver Kiddle [this message]
2002-01-07 14:37 ` Sven Wischnowsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3C173E6B.251ACAD4@yahoo.co.uk \
--to=okiddle@yahoo.co.uk \
--cc=akr@m17n.org \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).