From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7314 invoked from network); 27 Apr 2004 15:57:43 -0000 Received: from sunsite.dk (130.225.247.90) by ns1.primenet.com.au with SMTP; 27 Apr 2004 15:57:43 -0000 Received: (qmail 3115 invoked by alias); 27 Apr 2004 15:57:28 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 19841 Received: (qmail 3078 invoked from network); 27 Apr 2004 15:57:28 -0000 Received: from localhost (HELO sunsite.dk) (127.0.0.1) by localhost with SMTP; 27 Apr 2004 15:57:28 -0000 X-MessageWall-Score: 0 (sunsite.dk) Received: from [130.225.247.86] by sunsite.dk (MessageWall 1.0.8) with SMTP; 27 Apr 2004 15:57:27 -0000 Received: (qmail 6432 invoked from network); 27 Apr 2004 15:57:27 -0000 Received: from moonbase.zanshin.com (root@167.160.213.139) by a.mx.sunsite.dk with SMTP; 27 Apr 2004 15:57:24 -0000 Received: from aztec.zanshin.com (IDENT:schaefer@aztec.zanshin.com [167.160.213.132]) by moonbase.zanshin.com (8.12.11/8.12.11) with ESMTP id i3RFvMog006621 for ; Tue, 27 Apr 2004 08:57:22 -0700 Date: Tue, 27 Apr 2004 08:57:22 -0700 (PDT) From: Bart Schaefer To: zsh-workers@sunsite.dk Subject: PATCH: file-sort in _path_files Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=-0.0 required=6.0 tests=BAYES_40 autolearn=no version=2.63 X-Spam-Hits: -0.0 This seems to fix the bug I just reported; there may be a more elegant way -- such as, simply inserting a new (#q...) in the right place -- but I wasn't sure what ramifications that might have for the "copy qualifiers from the line" section that creates $tmp3 (just above the patched lines). More patching may still be needed for that portion. Index: Completion/Unix/Type/_path_files =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_path_files,v retrieving revision 1.23 diff -u -r1.23 _path_files --- Completion/Unix/Type/_path_files 8 May 2003 10:30:49 -0000 1.23 +++ Completion/Unix/Type/_path_files 27 Apr 2004 15:21:47 -0000 @@ -120,10 +120,10 @@ tmp2=() for tmp1 in "$pats[@]"; do - if [[ "$tmp1" = (#b)(*[^\$])(\(\([^\|~]##\)\)) ]]; then - tmp2=( "$tmp2[@]" "${match[1]}((${sort}${match[2][3,-1]}" ) - elif [[ "$tmp1" = (#b)(*[^\$])(\([^\|~]##\)) ]]; then - tmp2=( "$tmp2[@]" "${match[1]}(${sort}${match[2][2,-1]}" ) + if [[ "$tmp1" = (#b)(*[^\$])\(\((\#q)#(([^\|~])##\)\)) ]]; then + tmp2=( "$tmp2[@]" "${match[1]}((${sort}${match[3]}" ) + elif [[ "$tmp1" = (#b)(*[^\$])\((\#q)#(([^\|~])##\)) ]]; then + tmp2=( "$tmp2[@]" "${match[1]}(${sort}${match[3]}" ) else tmp2=( "$tmp2[@]" "${tmp1}(${sort})" ) fi