From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 42bb900f for ; Fri, 16 Aug 2019 01:12:47 +0000 (UTC) Received: (qmail 18686 invoked by alias); 15 Aug 2019 20:57:03 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44675 Received: (qmail 14208 invoked by uid 1010); 15 Aug 2019 20:57:03 -0000 X-Qmail-Scanner-Diagnostics: from mail-io1-f67.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.2/25538. spamassassin: 3.4.2. Clear:RC:0(209.85.166.67):SA:0(-1.9/5.0):. Processed in 4.400703 secs); 15 Aug 2019 20:57:03 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.166.67 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=EdqZflDIY6xsK1M1vnyacHhcIwuraI+E2zM3SFxgGLQ=; b=WOTUOzzNncxzbNA77L+IfaWfezBAbY2uJgEEwepNeD1zfFugalyVRpvR5udeYezukA QgQHAVnrXa/m4+8NGWgY86OxjC4wusRNFmWDInzioQa9ygahLh4fBu0ETmE1odXT0RVy KM26alW1l3ur+T1BsMtFJ2nIehg5eyuBsxouE1JeJMVl8kzMvCGNPgWp45m+wfT6J0bz 6M2QFEADUbhsdxdSQWOKwjpmeQna0XteCHL57ivykUqtYBdvPH/ifo5ppl1jdGV8OUHk kRFxFxF2GHNHBC+T8F8UTK+4iLwmRSwVP/NSW/dzSr0ws5H+gvUtlSK/CuKhDSnT/6OL FIUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=EdqZflDIY6xsK1M1vnyacHhcIwuraI+E2zM3SFxgGLQ=; b=Xy8hgoWYmEiToo8z2c5oLlaMFlqxPRCvx2JYAyRfeBGw1s3QGi++4en7B01i99dkiy UdKFGH+oUcclvgfhLO2uIEoBjgNpJT17mmo0QEv1BjyFM5DtlL9qsXUThS8UiZJwDGkf aZk0xBTse5nGYTfGJIBrxLRbY2YJSrPCzwH4So9qqSD0S263w7YB/EbjsQfGX+X0wPRH uUaznF1k1O0PLZucdwIu+6hmR2hcl0hCqzou5KtM9ZnadKIeVSmEWhpdUEOuxPiOit9c 9Vb6hfIxoppuokO0Jen0T+WZa/UGJbyYiddTYkmhYbhZxb41xlQZLlW7UMMR6tB2J03N PnjQ== X-Gm-Message-State: APjAAAXU4djGUKSmBlHzCxx5ZwYeYL9TVODfBTweBiqSpN6KVTh79hlI yNwi+UB/mL+aA1i3DQOl0Bi+nzZuhwkR7A== X-Google-Smtp-Source: APXvYqwAr8ihiwkBNo8MvOxWMxVWP/OtVlologBjYKUpTZ26gBuO23YhKqrqnxcqzGQLKeGknnxRZw== X-Received: by 2002:a05:6638:2ac:: with SMTP id d12mr4598276jaq.9.1565902584578; Thu, 15 Aug 2019 13:56:24 -0700 (PDT) From: dana Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Subject: [PATCH] _find: Fix return value Message-Id: <4A0FB427-B054-4EE2-99F4-558B41114A4E@dana.is> Date: Thu, 15 Aug 2019 15:56:23 -0500 To: Zsh hackers list X-Mailer: Apple Mail (2.3445.104.11) I noticed that _find wasn't respecting my matcher styles (e.g., `find = /a` wouldn't match /Applications), and it looks like it's because it = erroneously returns with 1 most of the time dana diff --git a/Completion/Unix/Command/_find = b/Completion/Unix/Command/_find index edd46ac1c..3b9150b17 100644 --- a/Completion/Unix/Command/_find +++ b/Completion/Unix/Command/_find @@ -1,6 +1,6 @@ #compdef find gfind =20 -local curcontext=3D"$curcontext" state_descr variant default +local curcontext=3D"$curcontext" state_descr variant default ret=3D1 local -a state line args alts disp smatch =20 _pick_variant -r variant gnu=3DGNU $OSTYPE -version @@ -147,7 +147,8 @@ _arguments -C $args \ '*-user:user:_users' \ '*-xdev' \ '*-a' '*-o' \ - '(-D -E -H -L -O -P -f -s -x --help --version)*:directory:_files -/' + '(-D -E -H -L -O -P -f -s -x --help --version)*:directory:_files -/' = \ +&& ret=3D0 =20 if [[ $state =3D times ]]; then if ! compset -P '[+-]' || [[ -prefix '[0-9]' ]]; then @@ -164,5 +165,7 @@ if [[ $state =3D times ]]; then alts=3D( "senses:sense${default}:compadd -V times -S '' -d disp -a = smatch" ) fi alts+=3D( "times:${state_descr}:_dates -f d" ) - _alternative $alts + _alternative $alts && ret=3D0 fi + +return ret