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.2 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 94951ac0 for ; Thu, 6 Feb 2020 16:06:26 +0000 (UTC) Received: (qmail 2238 invoked by alias); 6 Feb 2020 16:06:18 -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: 45388 Received: (qmail 18514 invoked by uid 1010); 6 Feb 2020 16:06:18 -0000 X-Qmail-Scanner-Diagnostics: from relay3.iserv.eu by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.1/25713. spamassassin: 3.4.2. Clear:RC:0(116.203.7.44):SA:0(-4.2/5.0):. Processed in 2.519094 secs); 06 Feb 2020 16:06:18 -0000 X-Envelope-From: martin.von.wittich@iserv.eu X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at iserv.eu designates 116.203.7.44 as permitted sender) Message-ID: <2525ceed25f15f4ef4984593df64bb1f@iserv.iserv.eu> Date: Thu, 06 Feb 2020 17:05:35 +0100 Subject: [PATCH] _diff_options doesn't support -w/--ignore-all-space for GNU diff From: Martin von Wittich To: "" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="_=_swift_1581005135_f9729bad97aaa774c5819adca90b14e1_=_" X-Mailer: IServ --_=_swift_1581005135_f9729bad97aaa774c5819adca90b14e1_=_ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I'm using GNU diff 3.7 and zsh 5.7.1 as provided by Debian 10.2, and I noti= ced that zsh's completion doesn't support diffs -w/--ignore-all-space param= eter. This is pretty annoying, because it means that it won't complete "new= file" in this case: diff -uw old new It'll think that -uw is "old file", and that "old" is "new file". I don't f= ully understand the _diff_options completion script, so my change might pro= bably not be completely correct, but the attached patch fixes it for me. Martin --_=_swift_1581005135_f9729bad97aaa774c5819adca90b14e1_=_ Content-Type: text/x-diff; name=_diff_options.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=_diff_options.patch LS0tIF9kaWZmX29wdGlvbnMJMjAxOS0wMi0wNSAwMToxODowMS4wMDAwMDAwMDAgKzAxMDAKKysr IC91c3Ivc2hhcmUvenNoL2Z1bmN0aW9ucy9Db21wbGV0aW9uL1VuaXgvX2RpZmZfb3B0aW9ucwky MDIwLTAyLTA2IDE2OjU3OjI1Ljc4NTMwMDUwNSArMDEwMApAQCAtODIsNiArODIsNyBAQAogICAg ICAgJy0tcGFsZXR0ZT1bc3BlY2lmeSBjb2xvcnMgdG8gdXNlXTpjb2xvcjpfZGlmZl9wYWxldHRl JwogICAgICAgIigkb2YgJG91YyktLXNpZGUtYnktc2lkZVtvdXRwdXQgaW4gdHdvIGNvbHVtbnNd IgogICAgICAgIigkb2YgJG91YykteVtvdXRwdXQgaW4gdHdvIGNvbHVtbnNdIgorICAgICAgJygt dyAtLWlnbm9yZS1hbGwtc3BhY2UpJ3stdywtLWlnbm9yZS1hbGwtc3BhY2V9J1tpZ25vcmUgYWxs IHdoaXRlIHNwYWNlXScKICAgICApCiAgIGVsc2UKICAgICBhcmdzKz0oICchLS1zcGVlZC1sYXJn ZS1maWxlcycgKQo= --_=_swift_1581005135_f9729bad97aaa774c5819adca90b14e1_=_--