about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-03-04 11:48:43 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-03-04 11:48:43 +0000
commit74c4a9c9bef38871bdab5987822e3ea55d8d85a1 (patch)
tree3b682a78d8fe55bdb7380329ffebb2d8f1e50cd4
parent6cc9c89d89905cbcc81feaec4e139960e179b10a (diff)
downloadzsh-74c4a9c9bef38871bdab5987822e3ea55d8d85a1.tar.gz
zsh-74c4a9c9bef38871bdab5987822e3ea55d8d85a1.tar.xz
zsh-74c4a9c9bef38871bdab5987822e3ea55d8d85a1.zip
unposted: improved handling of perforce @label and @date
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_perforce4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ad3712c73..32cee6ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  Peter Stephenson  <pws@csr.com>
+
+	* unposted: Completion/Unix/Command/_perforce: ignore range
+	limiters >, >=, =, <, <= after @ in labels and dates, too.
+
 2008-03-03  Peter Stephenson  <pws@csr.com>
 
 	* 24673: Test/D07multibyte.ztst: another attempt to sort
diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce
index 6b8a63c1b..271521141 100644
--- a/Completion/Unix/Command/_perforce
+++ b/Completion/Unix/Command/_perforce
@@ -708,7 +708,7 @@ _perforce_counter_values() {
 (( $+functions[_perforce_dates] )) ||
 _perforce_dates() {
   # Only useful in a file spec after `@'.
-  compset -P '*@'
+  compset -P '*@(|\\\<|\\\>)(|=)'
 
   # Date/time now in format required by Perforce.
   local now="$(date +%Y:%m:%d:%T)" name prefix
@@ -1351,7 +1351,7 @@ _perforce_labels() {
       argv=($argv[1,-2])
       # Completing after `@'.
       file=${${(Q)PREFIX}%%@*}
-      compset -P '*@'
+      compset -P '*@(|\\\<|\\\>)(|=)'
     fi
 
     ll=(${${(f)"$(_perforce_call_p4 labels labels ${file:+\$file})"}//(#b)Label\ ([^[:blank:]]##)\ (*)/$match[1]:$match[2]})