From 5019336110b4ca8507c13efd991db3ef0379f285 Mon Sep 17 00:00:00 2001
From: dana <dana@dana.is>
Date: Sat, 23 Jun 2018 18:53:45 -0500
Subject: 43088: Fix wajig sub-command completion

---
 ChangeLog                        | 4 ++++
 Completion/Debian/Command/_wajig | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fe2f3192c..0a10b9215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-23  dana  <dana@dana.is>
+
+	* 43088: Completion/Debian/Command/_wajig: Fix sub-command completion
+
 2018-06-18  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
 	* 43074: Eitan: Completion/Unix/Command/_gcc: Completion for
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 \
 
 case $state in
   cmds)
-    cmds=( ${${(M)${(f)"$(wajig commands 2>/dev/null)"}:# [^-]*}/(#b) ([^ ]#) #(*)/$match[1]:$match[2]:l} )
+    cmds=( ${(f)"$( _call_program commands $words[1] commands )"} )
+    cmds=( ${(@)cmds/(#b)([^ ]##) ##(?)(*)/$match[1]:${match[2]:l}${match[3]//:/\\:}} )
 
     _describe -t commands 'wajig command' cmds && ret=0
   ;;
-- 
cgit 1.4.1