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=-0.3 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,SUBJ_OBFU_PUNCT_FEW 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 505c8e0b for ; Sun, 22 Dec 2019 04:47:30 +0000 (UTC) Received: (qmail 22655 invoked by alias); 22 Dec 2019 04:47:25 -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: 45130 Received: (qmail 21968 invoked by uid 1010); 22 Dec 2019 04:47:25 -0000 X-Qmail-Scanner-Diagnostics: from mail-yb1-f195.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.1/25663. spamassassin: 3.4.2. Clear:RC:0(209.85.219.195):SA:0(-1.9/5.0):. Processed in 2.556543 secs); 22 Dec 2019 04:47:25 -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.219.195 as permitted sender) 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=0SaYULWnfDU/yn301Q4wrx9XB4OWTMbVOd8KNQOW80g=; b=nBIBqD/yGE6Yto9GrlFcEW9Co68pP9rZeJtkgbW8DGqnnJSfCGOtHE/tYcbJRwHgpY cHp/YV7worH66vXvoqA+qwaABYfz5P/DGqByRdclL6TLDiBj04iGpmL6Oa0aU2ZFhxTV /fEbmB7ftXKPksza2KEteRVkVs0u8ZBM1gd0Redqlk2U+RHJivPA7KYihZH/HEqqaPnV hLGcY7xG51jX7cXBKCyLERZCFWfXWLhlNYDU/6rrhwui93Y88s6YMIf0JJTxbEKpiZGq PJYD/u/MUTlkAiTLgvlW8HxM36SrzGc2uouO8H1NKIZIDLCuNv/4oPjv70DKlT1kJeNu XTcw== X-Gm-Message-State: APjAAAWBqHBAlMOvS0Xq7AH9zXd5YU9RrwxReri8oxN3cCu8odR3xz6K SGXVqwS2hlyS+eiTcbDD05cz61LCGwgGsw== X-Google-Smtp-Source: APXvYqxLkWpKcXbKOLnFVjqjGI2JAENTgBia3njhUCbDyi9Htyxbxw6209lls3qrQGBYhWeqOA7cSw== X-Received: by 2002:a25:3791:: with SMTP id e139mr16738979yba.506.1576990008722; Sat, 21 Dec 2019 20:46:48 -0800 (PST) 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] _multi_parts doesn't always pass -f to compadd Message-Id: Date: Sat, 21 Dec 2019 22:46:47 -0600 To: Zsh Workers List X-Mailer: Apple Mail (2.3445.104.11) I noticed this the other day and forgot about it until now. In some = cases (seemingly the most common ones?), _multi_parts doesn't pass -f to = compadd, which prevents colours/symbols from being applied to files. Just adding = -f to the list of options that are passed unconditionally seems to fix it? = Possibly some of the other options could be added too, but i didn't check dana diff --git a/Completion/Base/Utility/_multi_parts = b/Completion/Base/Utility/_multi_parts index 00e3e26cc..8a77ff0f0 100644 --- a/Completion/Base/Utility/_multi_parts +++ b/Completion/Base/Utility/_multi_parts @@ -15,7 +15,7 @@ typeset -U tmp1 matches =20 zparseopts -D -a sopts \ 'J+:=3Dgroup' 'V+:=3Dgroup' 'x+:=3Dexpl' 'X+:=3Dexpl' 'P:=3Dopts' = 'F:=3Dopts' \ - S: r: R: q 1 2 o+: n f 'M+:=3Dmatcher' 'i=3Dimm' + S: r: R: q 1 2 o+: n 'f=3Dopts' 'M+:=3Dmatcher' 'i=3Dimm' =20 sopts=3D( "$sopts[@]" "$opts[@]" ) if (( $#matcher )); then