From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43554-ml=inbox.vuxu.org@zsh.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, T_DKIM_INVALID 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 aed452ed for ; Tue, 25 Sep 2018 21:22:45 +0000 (UTC) Received: (qmail 9086 invoked by alias); 25 Sep 2018 21:22:33 -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: 43554 Received: (qmail 24882 invoked by uid 1010); 25 Sep 2018 21:22:33 -0000 X-Qmail-Scanner-Diagnostics: from mail-wr1-f44.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.221.44):SA:0(-1.9/5.0):. Processed in 3.97068 secs); 25 Sep 2018 21:22:33 -0000 X-Envelope-From: o.freyermuth@googlemail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=subject:to:references:cc:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=I8hw5RSx4+mhOuLOupRR1FNrq4cG+NG2aCfWscEKX8g=; b=trWLgG4LhVmTAMXpMgXM/U8pC1aOH2SjeKzcW+QsCehNtQvbx6NVcc5Ogrwo4xRqT2 kTFZL6LMffWGXWlKPvLG7E5cjeXYv46nFPCojQMdEYM362qu+JgQTqCclDAw7w55qlFe AmSvJkueoboGHTIGi8qfD9fD5jbLKd53T7Y3vvgpxSa7ITCpZP+XI2DC4NppSpx1CyXx DIXHhzr1klPmsnfRyGkaVzGpDIPJzGronl/DNbOzwBrV62fwa5MBrmjtz2HekYKcCLH5 xTLmYAfeMvY1k78JITc8X4eKeViSD0IlwNi/LlyfV1JCs5npHjSdQlKQS/S1IORbeMFu rkvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language; bh=I8hw5RSx4+mhOuLOupRR1FNrq4cG+NG2aCfWscEKX8g=; b=s5TtVsWT0wUNvbqAK2BE/bIEAxCw95gDqXt0Wc9flQ06S8OGxG/NUeL303vF7o07aK MdWhsEkvE4U+NVWiAjbv93PwXX88cAf0ds4DuRf5/H1gWrI0piwcK2yQzLPzSnI6DAJK P1Ut1cYOM/RjDq8uFmMxIGVsUBepgTKG4PIZ0uJLTLlzLXFzl/JvCzDIV8KH0nhQu8q4 bi0QKFszPa+uKpYlYzuQ/bR0SX4QqrjoHm2VTlrIweD90GBvunZDcz/RrG/k2CRChFPw k73Nww9Dy9HERt9/KhxOBJPPGfQCI+DNuKzIm98Mq15qeox11vyN+DxNioogK/OB7VpE xx0w== X-Gm-Message-State: ABuFfogRaevG5wVb4AdEhebypMJlpRlf5mrvfuiuhqOtineMP2DKUhp8 IYH/F45o//b2vxqYqMGXRr8hRIjP X-Google-Smtp-Source: ACcGV61u+PRA/FS5dyTXDLRGfHrCFrXOEpZgRsUE4jhYbPEQQVT80cALFkHh3bNe3wRc8ITy5SMIbQ== X-Received: by 2002:adf:9c93:: with SMTP id d19-v6mr2581940wre.11.1537910545110; Tue, 25 Sep 2018 14:22:25 -0700 (PDT) Subject: Re: zathura conpletion for zsh broken To: Daniel Shahaf References: <057ea9a2-d934-59e6-3109-e5093f0f9878@googlemail.com> <20180925192153.uwitfgrd2yydxtah@tarpaulin.shahaf.local2> <75619dc0-7b02-45bd-7cd9-a5078d6829a5@googlemail.com> <1537907787.166425.1520521784.2C5972A6@webmail.messagingengine.com> Cc: zsh-workers@zsh.org From: Oliver Freyermuth Openpgp: preference=signencrypt Autocrypt: addr=o.freyermuth@googlemail.com; prefer-encrypt=mutual; keydata= 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 KB7t2CoZv5xo0STm Message-ID: Date: Tue, 25 Sep 2018 23:22:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <1537907787.166425.1520521784.2C5972A6@webmail.messagingengine.com> Content-Type: multipart/mixed; boundary="------------827522248D4798631629A607" Content-Language: en-GB --------------827522248D4798631629A607 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Am 25.09.18 um 22:36 schrieb Daniel Shahaf: > Oliver Freyermuth wrote on Tue, 25 Sep 2018 22:02 +0200: >> Am 25.09.18 um 21:21 schrieb Daniel Shahaf: >>> Oliver Freyermuth wrote on Tue, Sep 25, 2018 at 17:14:04 +0200: >>>> +++ b/Completion/X/Command/_zathura >>>> @@ -25,7 +25,7 @@ _zathura_files(){ >>>> - supported_filetypes+="${${pf%.so}#${plugins_dir}/lib}" >>>> + supported_filetypes+="${${pf%.so}#${plugins_dir}/}" >>> >>> Isn't this equivalent to «supported_filetypes+=${pf:t:r}»? >> >> Indeed, it is, and that would be much easier. > > Pushed. I changed the log message to avoid mentioning implementation > terms (the variable's name) in ChangeLog, which is user-facing. Thanks! Didn't know this is copied as-is, I'll take better care in the future. Hopefully the commit message of the attached patch is better. >>> The 'break' on line 12 looks odd. Does zathura really ignore >>> /usr/lib/zathura/foo.so if /usr/local/lib/zathura/bar.so exists and >>> /usr/local/lib/zathura/foo.so does not? >> >> You are correct in spotting this, if I read the zathura code correctly >> (not a girara expert...), it "does the right thing" and searches the >> full list of paths. >> >> I'll try to cook up a patch fixing both those issues. Might take a >> while though, since I'm just starting with this (basically I started >> to investigate after "zathura " stopped doing anything after a >> zsh upgrade, makinɡ usage rather cumbersome). > > Thanks for the patch and looking into the additional issue. The attached patch fixes the second issue, I tested with a dummy .so in /usr/local/lib/zathura. Plugin file formats are now also made unique. Let me know if this can be simplified, or if it is in any case unneeded since the "uniqueness" is implicit in the matching code later on - I'm still learning more and more about the wonders of zsh expansion, and every bit I learn leaves me wondering how I could ever survive without that knowledge up to now. Cheers, Oliver > P.S. Our of curiosity, what's that U+0261 LATIN SMALL LETTER SCRIPT G doing there? Spotted very well, my font and mail client hid that from me. I did accidentally hit the keybinding for SCIM (Smart Common Input Method) while typing, and it started to interfere. That created some funny characters, and apparently I missed to remove the "g" once I noticed it. --------------827522248D4798631629A607 Content-Type: text/x-patch; name="0001-Fix-zathura-completion-ignoring-multiple-plugin-dire.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Fix-zathura-completion-ignoring-multiple-plugin-dire.pa"; filename*1="tch" >From 3d95608365dfc165c7a77bd3caad69b66b09f97b Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Tue, 25 Sep 2018 23:08:33 +0200 Subject: [PATCH] Fix zathura completion ignoring multiple plugin directories. --- Completion/X/Command/_zathura | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Completion/X/Command/_zathura b/Completion/X/Command/_zathura index 64888d013..5335c1143 100644 --- a/Completion/X/Command/_zathura +++ b/Completion/X/Command/_zathura @@ -8,8 +8,7 @@ _zathura_files(){ ${(Qv)opt_args[(i)-p|--plugins-dir]}(#qN) \ {/usr/local,/usr,}/lib/zathura(#qN) do - plugins_files=( $plugins_dir/*.so ) - (( $#plugins_files )) && break + plugins_files+=( $plugins_dir/*.so ) done if [[ -z "${plugins_files}" ]]; then _files -g "*.pdf(-.)" @@ -28,7 +27,7 @@ _zathura_files(){ supported_filetypes+="${pf:t:r}" fi done - _files -g "*.(${(j.|.)supported_filetypes})(-.)" + _files -g "*.(${(j.|.)${(@u)supported_filetypes}})(-.)" } _arguments -s -S \ -- 2.16.4 --------------827522248D4798631629A607--