From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-42209-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 13886 invoked by alias); 3 Jan 2018 21:30:07 -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: 42209
Received: (qmail 14243 invoked by uid 1010); 3 Jan 2018 21:30:06 -0000
X-Qmail-Scanner-Diagnostics: from mail-io0-f171.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.171):SA:0(-1.9/5.0):. 
 Processed in 8.945264 secs); 03 Jan 2018 21:30:06 -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,SPF_PASS,
	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=M7tCCk0jm3VGCKlsUBavC2uHxU3TmG+YuTjbM6j5Hrg=;
        b=TmQotGsamb6xhUUnxLSI8jhVoyCXR2KR6I94VKYrrMQomb/52jhhMutkNXI7jGhq7e
         fR39pcmFzwNHmZmAO4qv/0R5hBjn89bC15AUr4X5bE2wYvWqLniuAFxofgRzaQHRSm34
         /QD3SdxjhKnq0XNP2DVVo2QUccmRd4h8J7QtTcgFm9z00GPKX4lteqywFn3QAJ2sVGSK
         4G1RWOqqWG6DRp/kqdVpd2Dg/q2D3qWF4yei7YcqRfKTD8cPXCT1CJObd1xyLgM821uC
         eGZHQtUR+W82Hgr40hf5ymOqOv4K/Z99txLXbLFgwWA10lCFi7QL1qbaQ4+dLPFiJcgb
         KYrg==
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=M7tCCk0jm3VGCKlsUBavC2uHxU3TmG+YuTjbM6j5Hrg=;
        b=GQf3SlbA2PFbkTgY43eOqJMcKfGSQ7nE8BbE1UVob7u60B+y5HWegrfAYcMX1LSmig
         xuXX4SN/iOjKuKzHibnZ50I0EBPBsig0SD/1ydFMCGmsvhvgKfqxAj3ViaS8SQhyB5mS
         EtCLKiPEBqOvpEyhQgU3/VmbDhvKfqa9/cMWMHbwkubPSNG5mfdD0+12kbeGzxlR3hTK
         ol81UYAlkSWJQq8qWTSb1cSms83EqwSSe7NxlL6/7xqJKy2Eh+90x3QG8a0KEXD30AL5
         rINSYyaIo5texhj25YaHNn6Txqa3jWl+/sM3rlP6pPNvgh8XFgNdp3kSXLahXsLfXZ96
         64lA==
X-Gm-Message-State: AKGB3mK8DIJr+Bq6nVx09m8Qiw5R9S+yOQ+h8St/+zw9/YaXbnAFJ2xS
	QbwnZkNVUb8/nv4DWR4eeqpYEO80NjU=
X-Google-Smtp-Source: ACJfBot4CpifsNh4qIk309OL4Lkecb9D7VtadJgU4HeHnIQb+BeBIDObic104Yh/s0gbNjBtjfI/gw==
X-Received: by 10.107.36.82 with SMTP id k79mr3203253iok.45.1515014994341;
        Wed, 03 Jan 2018 13:29:54 -0800 (PST)
From: dana <dana@dana.is>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: [PATCH] Completion batch #2: Misc. trivial fixes
Message-Id: <289FC0FD-FDAB-4575-8882-E9F8F3FFE4C5@dana.is>
Date: Wed, 3 Jan 2018 15:29:52 -0600
To: zsh-workers@zsh.org
X-Mailer: Apple Mail (2.3273)

Some trivial/miscellaneous changes to existing functions:

1. I fixed a bug in `tr` completion =E2=80=94 it wasn't showing the =
option descriptions
   for non-GNU variants.

2. I updated `expand` and `unexpand` completion to account for numeric =
options
   as in `expand -4` (instead of `expand -t4`); most variants support =
this. I
   excluded BusyBox, even though the function doesn't currently make any =
effort
   to check for it, because i plan to gradually add support for BusyBox =
variants
   when it's not too irritating (will show up in later batches).

The changes after this one will be more complex.

dana


diff --git a/Completion/Unix/Command/_tr b/Completion/Unix/Command/_tr
index d244bf875..1cfe1200a 100644
--- a/Completion/Unix/Command/_tr
+++ b/Completion/Unix/Command/_tr
@@ -28,7 +28,7 @@ case $variant in
   ;|
   *)
     for k in c d s; do
-      args+=3D( -$k$descr[$k] )
+      args+=3D( -$k$descr[-$k] )
     done
   ;;
 esac
diff --git a/Completion/Unix/Command/_unexpand =
b/Completion/Unix/Command/_unexpand
index 13f6ce835..b548b3c3a 100644
--- a/Completion/Unix/Command/_unexpand
+++ b/Completion/Unix/Command/_unexpand
@@ -28,6 +28,10 @@ elif [[ $OSTYPE =3D (*bsd*|dragonfly*|darwin*) ]]; =
then
 fi
 [[ $service =3D *un* ]] && args+=3D(  "(--all --help =
--version)-a[$all]" )
=20
+# Most (un)expand variants, excluding BusyBox, allow e.g. -4 instead of =
-t4
+[[ $_cmd_variant[$service] =3D=3D *busybox* ]] ||
+args+=3D( '!(-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -t --tabs)-'{0..9} )
+
 _arguments -s -S "$args[@]" \
   "(--tabs --help)-t+${tabs}" \
   '*:file:_files'