From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-13725-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 15363 invoked from network); 23 Mar 2001 10:37:31 -0000
Received: from sunsite.dk (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 23 Mar 2001 10:37:31 -0000
Received: (qmail 22882 invoked by alias); 23 Mar 2001 10:37:19 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 13725
Received: (qmail 22871 invoked from network); 23 Mar 2001 10:37:18 -0000
Date: Fri, 23 Mar 2001 11:37:18 +0100 (MET)
Message-Id: <200103231037.LAA08358@beta.informatik.hu-berlin.de>
From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.dk
Subject: PATCH: quoting colons


Two places where we should check if the colon is quoted, otherwise an
_arguments spec like `-foo\:-[...]:..:(...)' yielded a description of `-1'.


Bye
 Sven

Index: Completion/Core/_all_labels
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Core/_all_labels,v
retrieving revision 1.5
diff -u -r1.5 _all_labels
--- Completion/Core/_all_labels	2000/05/31 09:38:26	1.5
+++ Completion/Core/_all_labels	2001/03/23 10:35:15
@@ -27,7 +27,7 @@
 
 while comptags "-A$__prev" "$1" curtag __spec; do
   _comp_tags="$_comp_tags $__spec "
-  if [[ "$curtag" = *:* ]]; then
+  if [[ "$curtag" = *[^\\]:* ]]; then
     zformat -f __descr "${curtag#*:}" "d:$3"
     _description "$__gopt" "${curtag%:*}" "$2" "$__descr"
     curtag="${curtag%:*}"
Index: Completion/Core/_next_label
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Core/_next_label,v
retrieving revision 1.5
diff -u -r1.5 _next_label
--- Completion/Core/_next_label	2000/05/31 09:38:26	1.5
+++ Completion/Core/_next_label	2001/03/23 10:35:15
@@ -9,7 +9,7 @@
 
 if comptags -A "$1" curtag __spec; then
   _comp_tags="$_comp_tags $__spec "
-  if [[ "$curtag" = *:* ]]; then
+  if [[ "$curtag" = *[^\\]:* ]]; then
     zformat -f __descr "${curtag#*:}" "d:$3"
     _description "$__gopt" "${curtag%:*}" "$2" "$__descr"
     curtag="${curtag%:*}"

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de