From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24817 invoked by alias); 16 Apr 2018 14:28:51 -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: 42658 Received: (qmail 22849 invoked by uid 1010); 16 Apr 2018 14:28:51 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net 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(205.235.26.22):SA:0(-1.4/5.0):. Processed in 1.59221 secs); 16 Apr 2018 14:28:51 -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.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_PASS,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: SRS0=5Giu=HF=yahoo.co.uk=okiddle@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.co.uk X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1523888336; bh=0ibvl5zzbVUTqok/w7JaxC6p36Nm7ojEIbSbj4/NuiE=; h=From:To:Subject:Date:From:Subject; b=FS6LxcuuGM77nEABbrz0/zICP+3Rj/PQhu/3i+DETSLOedwZr/YSFpOQH8PAETE7tPAkWrt7H3oK4f/mmIPH6r1QlQMsstRaVuZ1Nj5F4tJGye9qkmzR7rsehh3Dl+TODIpQ63kO5lK/3BqRN7maJgB5T58T9EbWS90cJBUnGJkgN3G1rwb+YjO/o6qUJZrFnggsBP3A6IstXaV6y9fqI+zH0wKfF0vgs6t9dWJu5H7/ekkiWicMVRQ615liGcMNyhJMvTA0MfCyDqbP9V/ebTnk2Hp00uzDN6gyCcF2x0swmgopbbDlBrA58RLZ0BxPJnB+uQC2YbOXDR7DFl6Mwg== X-YMail-OSG: PextjnwVM1kqxi4K4SsNNvDxj8HtpLRe2u68tYqdDg6TB3qksBgmea4Ep7dFW4l iay98DSNLU2rnFLq4gBo9UMdxIBaPVF7kIvNG80Cgq4BrUpvgsg1Ux8ZlNAaJ8X9sN0jnNoUlZEP rdla1QcVA_Haz_oNja8zmvNTEpqaxqH5wbaOrFbLmwGd2qqa6Cv1pUI6x6glWgn6oxg9xr8K8zBS Enii.HbfJ6mO9_CuVqOErxFGCW7zl5_zmUishFdifpmKiP1hi_JjCW4OXos6X4R6rfYwDaY.CmUc 5yhmA4Qg1bP_reFH2GLaU0Ax.yN0.7SVafQXtWmqqsU3g5WRXk7YGXKzzMKjtzBpTgWBKKDuoTIC iDbnt5BIrSxvMM1zwb_y74c4OJLpMLfRxHEp7hgMsKHZoDa_ZfieAkswnslPCSCDDpb.quVi1D_X HLAlpinhh9OQPTUmwjt7iFTcXRPhUHQvK8QdwZZzwhtKw7JpzoZWysMBgsu2T67FmawtNzdll2oI pv.C41zVLDw-- From: Oliver Kiddle To: Zsh workers Subject: PATCH: diffstat completion - allow compact option forms MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <8886.1523888328.1@thecus> Date: Mon, 16 Apr 2018 16:18:49 +0200 Message-ID: <8887.1523888329@thecus> diffstat allows options like -p1 with the argument in the same word as the option. The completion should also allow this. Also fix one typo. Oliver diff --git a/Completion/Unix/Command/_diffstat b/Completion/Unix/Command/_diffstat index c9f8e3049..9e7bf779b 100644 --- a/Completion/Unix/Command/_diffstat +++ b/Completion/Unix/Command/_diffstat @@ -5,28 +5,28 @@ _arguments -s -S \ '-c[prefix each line with hash mark]' \ '-C[use color highlighting of histogram]' \ '-d[print debug information]' \ - '-D[specify location of patched files for unchanged count]:location:_directories' \ - '-e[redirect standard error to specified file]:error file:_files' \ + '-D+[specify location of patched files for unchanged count]:location:_directories' \ + '-e+[redirect standard error to specified file]:error file:_files' \ '-E[trim escape sequences, e.g. from colordiff]' \ - '-f[specify histogram format]:format:((0\:concise 1\:normal 2\:dots 3\:dots+normal 4\:value 5\:value+normal 6\:value+dots 7\:value+dots+normal))' \ + '-f+[specify histogram format]:format:((0\:concise 1\:normal 2\:dots 3\:dots+normal 4\:value 5\:value+normal 6\:value+dots 7\:value+dots+normal))' \ '(- *)-h[display help information]' \ '-k[suppress merging of filenames in report]' \ '-K[resolve ambiguity of "only" filenames]' \ '-l[list only the filenames]' \ '-m[merge insert/delete data in chunks as modified-lines]' \ - '-n[specify minimum width for filenames]:width [auto]' \ - '-N[specify maximum width for filenames]:width [auto]' \ - '-o[redirect standard output to specified file]:output file:_files' \ - '-p[specify number of path separators to strip]:path components [common]' \ + '-n+[specify minimum width for filenames]:width [auto]' \ + '-N+[specify maximum width for filenames]:width [auto]' \ + '-o+[redirect standard output to specified file]:output file:_files' \ + '-p+[specify number of path separators to strip]:path components [common]' \ '-q[suppress "0 files changed" message for empty diffs]' \ - '-r[specify rounding for histogram]:rounding:((0\:none 1\:simple 2\:simple+adjustment))' \ + '-r+[specify rounding for histogram]:rounding:((0\:none 1\:simple 2\:simple+adjustment))' \ '(-t)-s[show only the summary line]' \ - '-S[specify location of original files for unchanged count]:location:_directories' \ + '-S+[specify location of original files for unchanged count]:location:_directories' \ '-R[assume patch was created with old and new files swapped]' \ '(-T -s)-t[overrides histogram, generates csv output]' \ '(-t)-T[print amounts (like -t) in addition to histogram]' \ '-u[suppress sorting of filenames in report]' \ '-v[show progress]' \ '(- *)-V[print version number]' \ - '-w[specify maximumn width of output]:maximum width [80]' \ + '-w+[specify maximum width of output]:maximum width [80]' \ '*:patch file:_files'