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 a1b0beb2 for ; Wed, 18 Sep 2019 09:15:05 +0000 (UTC) Received: (qmail 16738 invoked by alias); 18 Sep 2019 09:14:57 -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: 44767 Received: (qmail 13060 invoked by uid 1010); 18 Sep 2019 09:14:57 -0000 X-Qmail-Scanner-Diagnostics: from mail-io1-f51.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.2/25573. spamassassin: 3.4.2. Clear:RC:0(209.85.166.51):SA:0(-1.9/5.0):. Processed in 1.675493 secs); 18 Sep 2019 09:14:57 -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.51 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 :cc:to; bh=EvJJfCNxJk1csnmpuMJN6eSLea/2QSXATSeQBtokcvI=; b=Q+QUtQNeqDADbtRDejsI9ea/mGjc5FhAWz+xOticySHOleN11hVUkJc9FpTiC7RXu7 6Y9t4CWBDxAd5oYv5+weQDePk5uozKjc6tvUdId47IUl0UVT+EivoHrzlnlh1Fk4PJLH Tdr7STh70e3ye8C/3YGN+N/Y4RH6w5FDv0EmLeAvM/aIL756bFJj7B/lTPnFnwuOqtgE a1Nw+GirJb9YY2mZiKBVlDiYb2nCIUOOWE5fTsyK7X+UR/TGRjIcLLVHbepUFTcRCTxE hfQDXpqIxjVv7TgOWRJLEJRlmVnE0qOPMvszjDDxt39ggrCExpdz+NFy+uSSVoIt0W7g HR6A== 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:cc:to; bh=EvJJfCNxJk1csnmpuMJN6eSLea/2QSXATSeQBtokcvI=; b=oBSm4lDR7It+LqBsZbNn02+R2cReoOpplxQBFV9FWCDpoRMbucJeHC6z7/7+SInChG HfvQPgjzP8pId6lI+QWUcnjXjwpgsWugoG15W9xXbtVMk3lsboxL5ctqLtRFz1UiJ9af 2nDByfxTU3kTyKqd8ID1jSOumI5/D8TYAul/B2u8p1fubdcNN1Te/WQth/ViEQ6odcmK UhzvRBHj9RnSUJk3GBKo7wXTjkdIaJSdU7/PXzxGKnOWPuh8kMqfC45781I/ffC3YQAS mDZudw6IT4ps6q66zW61Jah9lWlGh9i4v1tachqObKSjPsIwjvz1sQdOvh2CdMHtUanq ED8w== X-Gm-Message-State: APjAAAWhUFBCTsTREd/03Feyh55vJRC+FPLymdbRlgaaWG03VgfFNuje zuIHKgl+2GG+XP+lHu7dewl4Dl3J8zv6wQ== X-Google-Smtp-Source: APXvYqyIF4I1mDRhn5JH+xBwkG6CEvj+MRLMIamZz2mGTbe/zRQCuf26mqa3JGq9dRUzB1lYXOpOSw== X-Received: by 2002:a05:6602:2244:: with SMTP id o4mr2776024ioo.107.1568798061399; Wed, 18 Sep 2019 02:14:21 -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] Fix `_description -J` Message-Id: <0D8A1750-C2FE-4DB1-A330-9B2805FC1D40@dana.is> Date: Wed, 18 Sep 2019 04:15:54 -0500 Cc: Oliver Kiddle To: Zsh hackers list X-Mailer: Apple Mail (2.3445.104.11) I noticed that workers/44274 introduced a bug related to `_description = -J`. When invoked this way, the function now adds -J to expl twice, yielding something like... -J -J foo -X 'completing foo:' ... which breaks completion. Can we simply do this? My brain is too muddy right now to understand the = full implications, but it seems like it should work...? (Can't remember why i actually wanted to use `_description -J`; just = found it in one of my functions) dana diff --git a/Completion/Base/Core/_description = b/Completion/Base/Core/_description index c2a0e080b..bdb4007a6 100644 --- a/Completion/Base/Core/_description +++ b/Completion/Base/Core/_description @@ -1,13 +1,13 @@ #autoload =20 local name nopt xopt format gname hidden hide match opts tag -local -a gropt sort +local -a ign gropt sort =20 opts=3D() =20 xopt=3D(-X) nopt=3D() -zparseopts -K -D -a nopt 1 2 V=3Dgropt J x=3Dxopt +zparseopts -K -D -a nopt 1 2 V=3Dgropt J=3Dign x=3Dxopt =20 3=3D"${${3##[[:blank:]]#}%%[[:blank:]]#}" [[ -n "$3" ]] && _lastdescr=3D( "$_lastdescr[@]" "$3" )