* PATCH: Yet another _perforce options patch
@ 2003-08-22 10:20 Peter Stephenson
0 siblings, 0 replies; only message in thread
From: Peter Stephenson @ 2003-08-22 10:20 UTC (permalink / raw)
To: Zsh hackers list
Felix pointed out that completion of global options doesn't take into
account existing options properly.
Also now offers to complete the default port 1666.
Index: Completion/Unix/Command/_perforce
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_perforce,v
retrieving revision 1.12
diff -u -r1.12 _perforce
--- Completion/Unix/Command/_perforce 21 Aug 2003 18:27:19 -0000 1.12
+++ Completion/Unix/Command/_perforce 22 Aug 2003 10:16:38 -0000
@@ -273,8 +273,11 @@
# end of the arguments list, anyway.
for (( i = 2; i < CURRENT; i++ )); do
if [[ $words[i] = -[$argopts_pass$argopts_ignore] ]]; then
- # word with following argument
- if [[ $words[i] = -[$argopts_pass] ]]; then
+ # word with following argument --- check this
+ # is less than the current word, else we are completing
+ # this and shouldn't pass it down
+ if [[ $(( i + 1 )) -lt $CURRENT && \
+ $words[i] = -[$argopts_pass] ]]; then
_perforce_global_options+=(${words[i,i+1]})
fi
(( i++ ))
@@ -912,6 +915,8 @@
_perforce_hosts_ports() {
if compset -P '*:'; then
_ports
+ local expl
+ _wanted ports expl port compadd "$@" 1666
else
# is this -q-able?
_hosts -S :
--
Peter Stephenson <pws@csr.com> Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070
**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential
and/or privileged material.
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by
persons or entities other than the intended recipient is
prohibited.
If you received this in error, please contact the sender and
delete the material from any computer.
**********************************************************************
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-08-22 10:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-08-22 10:20 PATCH: Yet another _perforce options patch Peter Stephenson
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).