From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-43088-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 6412 invoked by alias); 22 Jun 2018 15:59:14 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 43088
Received: (qmail 10245 invoked by uid 1010); 22 Jun 2018 15:59:14 -0000
X-Qmail-Scanner-Diagnostics: from mail-io0-f195.google.com by f.primenet.com.au (envelope-from <dana@dana.is>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(209.85.223.195):SA:0(-1.9/5.0):. 
 Processed in 1.349355 secs); 22 Jun 2018 15:59:14 -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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE,
	RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIMWL_WL_MED,T_DKIM_INVALID autolearn=ham
	autolearn_force=no version=3.4.1
X-Envelope-From: dana@dana.is
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
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
         :to;
        bh=Acw+bc7iW++1aahu1WM5fTb5gTWm3IO0jG3S6tSEdBo=;
        b=evqOrwITnNK5+FcijgSzExoORjk+2SeQvIb2qmI1PdVJbRJvseE7/i/tmNNh6uBUvR
         vpkQyEq0mcoILoSusb/lfNWPLFpc6MP3Cok5IsSAGH7uI+nJ3E8TQZTXEpXoCZF9H8Cb
         6qD0M7jMxf55dZa0z6ioDgOhBxmWEUZAQ5AfRrXfWsM5KCvM5O9ip8VveC4QT8Oq29dt
         C+7cr+ePEOQUHdw4rTe9WBAs+UyEOode/xmwWFk53xhxLMCp0/en5Q/TFxCsFi/OrY5w
         +jSKfK1oF7Vyb0T6MFIJiD8f9T6nSJck9u2tuJlBFY2VjhZ7jd93A3rvj9CuPI7rCUB4
         erXA==
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=Acw+bc7iW++1aahu1WM5fTb5gTWm3IO0jG3S6tSEdBo=;
        b=tLsQxkTG/2ohXBFykwOetMJY98mkTnHWJz3oiZ+1ioR6m2IL8dp1Ie2W+Bywa+mgpR
         0yaon51k1wv2xfXGM/Ab04P5aFXWZM6WDzqSB3EKrYaznyyHZ5BkjyJx5RXMQCufgnSQ
         8oSn8nFJztKfRgswlSqPy4V8lHHjnZIKw35IQAHpMPSI0jLQEiViJsHSVtJRNEwulGEh
         RB3xHvxkdYRT4thkb77AcF7TgFA42dAJhwWWzVB23mo3V5aEm9EW68EinDTzX6M3/Plc
         mySCTUl22znsQmC2pVV0epdoYprO6Weti+Dfjuk8qiPWPtyf+iDTzmgDvT4ZGTrtZbBT
         eESw==
X-Gm-Message-State: APt69E1FmFbvfCpeYRsYyrpdQG/YQjiu2Bw7Vh0Vw9zfm0zbVAvNQziC
	8jz+vlb9hToW4VQw7nqUE7eR12F6V6Y=
X-Google-Smtp-Source: ADUXVKK7obCL7bAdZeW1AQa9IR+vheexIBzsd/NEm1X8hHARA2mpX/sYh8XR+YQ/vbaDlPQmANidJg==
X-Received: by 2002:a6b:9c95:: with SMTP id f143-v6mr1745623ioe.22.1529683149587;
        Fri, 22 Jun 2018 08:59:09 -0700 (PDT)
From: dana <dana@dana.is>
Content-Type: text/plain;
	charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\))
Subject: [PATCH] Completion: Fix _wajig
Message-Id: <B129F618-D6BA-4271-9FE1-AC5DB25B8C89@dana.is>
Date: Fri, 22 Jun 2018 10:59:07 -0500
To: Zsh workers <zsh-workers@zsh.org>
X-Mailer: Apple Mail (2.3445.6.18)

Someone on /r/zsh complained that wajig sub-commands don't complete. =
There must
have been an output format change some time ago.

This updates the function to account for the format change, and also =
improves
the description capitalisation and escaping.

dana


diff --git a/Completion/Debian/Command/_wajig =
b/Completion/Debian/Command/_wajig
index 26d08cfd7..630507e67 100644
--- a/Completion/Debian/Command/_wajig
+++ b/Completion/Debian/Command/_wajig
@@ -14,7 +14,8 @@ _arguments -C -s \
=20
 case $state in
   cmds)
-    cmds=3D( ${${(M)${(f)"$(wajig commands 2>/dev/null)"}:# [^-]*}/(#b) =
([^ ]#) #(*)/$match[1]:$match[2]:l} )
+    cmds=3D( ${(f)"$( _call_program commands $words[1] commands )"} )
+    cmds=3D( ${(@)cmds/(#b)([^ ]##) =
##(?)(*)/$match[1]:${match[2]:l}${match[3]//:/\\:}} )
=20
     _describe -t commands 'wajig command' cmds && ret=3D0
   ;;