From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24389 invoked by alias); 24 Aug 2018 15:43:39 -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: 43331 Received: (qmail 14754 invoked by uid 1010); 24 Aug 2018 15:43:39 -0000 X-Qmail-Scanner-Diagnostics: from wout2-smtp.messagingengine.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(64.147.123.25):SA:0(-2.6/5.0):. Processed in 2.822941 secs); 24 Aug 2018 15:43:39 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=tkx+ji1MgpDCJbFe5 m00Cwfw1vjGaPdImryp4t2dKGw=; b=nAYPMShTC6xmbxDtHZvV/8Yw4slQtfsts PwOPyJubarfdFHJ4qGZHKVawdjkJ6iDWzUATb6rEpFfMD0+YMHA4O8ZpoSVNC9Md 6kNMDvYGy6uOvw8RoBDUBat1nzPWya+8Sqf/LpTwIfQ4aPx1YxclRzQHGlZmvnb3 uGQOAIR9bHleElasYDp8lXLuhHXZNJOsheD99FJGx9vzwq017aNB4fUZLZkXaccv du5nV1mPbYgButd4T+Mc7p1Ny/Af1jmNI29KNBAbkfAkNZwCkdpvTfVNKaUXdQe2 0uXYb90AQigyKPR2Qgc/cz+350XwEav8KWdXBAqmy/HfENgJKV2MQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=tkx+ji1MgpDCJbFe5 m00Cwfw1vjGaPdImryp4t2dKGw=; b=H5LUQSxCaBg3QekIAS05rWYmQ3GT5uRPU 3+psP/EVgdLW0PJ7hYdnpBghI6opstI+ThzKbIVZolrYVx9PRrH8Qwc7S4PNSu3U Yfju1Uh+km6t/Rb/xp2KqGNxsIJUbXyZB8gh+uA8TOguLkF9akYPdLN4/akXEEtu uEv6HMZE5/vQzTsBO0ujTHTEMhfO3Zn21BdGo0CQkVKHL3hcz0gF+7bafaTmLYM+ p0FakkPft2Jj5OCOo8aifR8BUHrvtjXap0S5t03ei90xmBeVDvw6hK5xo0oDfyoY 0Npe8asHlqICYX2bweenRqowxtowPf/d+Wo0NALI8j16o2/vQxyAQ== X-ME-Proxy: X-ME-Sender: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] _diff3: Enhance positional argument descriptions (thanks, Oliver). Date: Fri, 24 Aug 2018 15:43:29 +0000 Message-Id: <20180824154329.17495-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 --- Completion/Unix/Command/_diff3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Completion/Unix/Command/_diff3 b/Completion/Unix/Command/_diff3 index 81e274d05..524507ce0 100644 --- a/Completion/Unix/Command/_diff3 +++ b/Completion/Unix/Command/_diff3 @@ -39,8 +39,8 @@ else fi _arguments -s -S $args \ - '1:updated file:_files' \ - '2:original file:_files' \ - '3:updated file:_files' \ + '1: : _wanted files expl "first updated file (${${(As.:.)opt_args[-L]}[1]:-mine})" _files' \ + '2: : _wanted files expl "original file (${${(As.:.)opt_args[-L]}[2]:-old})" _files' \ + '3: : _wanted files expl "second updated file (${${(As.:.)opt_args[-L]}[3]:-their})" _files' \ + '(ed)' $ed