From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10121 invoked by alias); 19 May 2011 18:17:58 -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: X-Seq: 29328 Received: (qmail 17796 invoked from network); 19 May 2011 18:17:55 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW, T_TO_NO_BRKTS_FREEMAIL autolearn=ham version=3.3.1 Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.google.com designates 209.85.161.43 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer; bh=VZpXGVjaeRpiTWi9NmN5C6AMtygL4VgpM8qq+2LJHnc=; b=T+BmAgJpCunKl5DIOwjcTN4GGb4/vCCWdeJgAk5x6M4kqftaPXac0RBUixk0OSBfwf 4x9/3d9P1wP1hLC3KwIwVXOe+fWZUcGMWig2Ot8cRhnOtmWRDaiLcvByolgfQPMJTsWu L4A306RpYJh4QHLo+EmyEnRP9wJOmYIdih2Yc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer; b=U6v6QLRr4RrmpdsyA62uD35QkWZ3Uy/GldwHChXAODdgnD436wWu3Gqepzo8OnTEb6 0oOVG/pxyieNz2ph1yWtFjIdf7KHTT5WT9odOlHGZsZD9/3gRyovzJ/V0wBvOULwf83N CC5XIeasevXW9yF2qcOm1GEsYiFrNO96VQbd0= From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: another missing \ in _git, remove some not missing \ in other completers Date: Thu, 19 May 2011 20:11:35 +0200 Message-Id: <1305828695-9858-1-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 1.7.4-rc1 :vimgrep /'$\n\(\s\+\)'.*\(\n\1\S.*\)\{1,3}\\$/ Completion/**/_* I only meant for it to find missing \, but it turns out to also find \ where they shouldn't be, ie when defining arrays to be passed to _arguments. --- Completion/Redhat/Command/_rpm | 2 +- Completion/Unix/Command/_git | 2 +- Completion/Unix/Command/_gnutls | 2 +- Completion/Unix/Command/_gpg | 4 ++-- Completion/Unix/Command/_growisofs | 14 +++++++------- Completion/Unix/Command/_php | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Completion/Redhat/Command/_rpm b/Completion/Redhat/Command/_rpm index 184d7b0..83922b6 100644 --- a/Completion/Redhat/Command/_rpm +++ b/Completion/Redhat/Command/_rpm @@ -55,7 +55,7 @@ _rpm () { '--httpport:http port number' {-\?,--help}'[print help information]' '--version[print version number]' - '--pipe:pipe command:->command' \ + '--pipe:pipe command:->command' ) # package selection options of which only one can be used diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 9aa14a7..ea4726c 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -3958,7 +3958,7 @@ _git-name-rev () { '--refs=[only use refs matching given pattern]: :_guard "?#" "shell pattern"' \ '(--stdin :)--all[list all commits reachable from all refs]' \ '(--all :)--stdin[read from stdin and append revision-name]' \ - '--name-only[display only name of commits]' + '--name-only[display only name of commits]' \ '--no-undefined[die with non-zero return when a reference is undefined]' \ '--always[show uniquely abbreviated commit object as fallback]' \ '(--stdin --all)*: :__git_commits' && ret=0 diff --git a/Completion/Unix/Command/_gnutls b/Completion/Unix/Command/_gnutls index 64f8e3c..169e38b 100644 --- a/Completion/Unix/Command/_gnutls +++ b/Completion/Unix/Command/_gnutls @@ -8,7 +8,7 @@ local _gnutls_cli_common_args _gnutls_cli_common_args=( '(-d --debug)'{-d,--debug}':debug level' '(-p --port)'{-p,--port}':port' - '(-h --help)'{-h,--help}'[help]' \ + '(-h --help)'{-h,--help}'[help]' ) case "$service" in diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg index 3043f7a..6f2fd48 100644 --- a/Completion/Unix/Command/_gpg +++ b/Completion/Unix/Command/_gpg @@ -22,7 +22,7 @@ gpgbasic=('(-e --encrypt)'{-e,--encrypt}'[encrypt data. this option may be combi '(-c --symmetric)'{-c,--symmetric}'[encrypt with symmetric cypher only]' '(-s --sign)'{-s,--sign}'[make a signature]' '*'{-r+,--recipient}'[specify user to encrypt for]:recipient:->public-keys' - '(-u --local-user)'{-u+,--local-user}'[use name as the user ID to sign]:user attachment:_users'\ + '(-u --local-user)'{-u+,--local-user}'[use name as the user ID to sign]:user attachment:_users' '(-o --output)'{-o+,--output}'[write output to file]:output file:_files' '(-h --help)'{-h,--help}'[display usage information]' '--version[print info on program version and supported algorithms]') @@ -44,7 +44,7 @@ gpgextra=('--decrypt-files[decrypt multiple files]' '--list-packets[list only the sequence of packets]' '--gen-key[generate a new pair key]' '--edit-key[a menu for edit yours keys]:key attachment:->public-keys' - '--sign-key[sign a key]:key attachment:->public-keys'\ + '--sign-key[sign a key]:key attachment:->public-keys' '--lsign-key[sign a key but mark as non-exportable]:key attachment:->public-keys' '--nrsign-key[sign a key non-revocably]' '--delete-key[remove key from public keyring]:key attachment:->public-keys' diff --git a/Completion/Unix/Command/_growisofs b/Completion/Unix/Command/_growisofs index 09a04c6..dcccf64 100644 --- a/Completion/Unix/Command/_growisofs +++ b/Completion/Unix/Command/_growisofs @@ -75,13 +75,13 @@ find_expressions=( '*-size[true if the size of the file is in the given range]:range' '*-sparse[true if the file appears to be sparse]' '*-true[always true]' - '*-type[true if the file is of the given type]:file type:((b\:"block (buffered) special" \ - c\:"character (unbuffered) special" \ - d\:directory \ - p\:"named pipe (FIFO)" \ - f\:"regular file" \ - l\:"symbolic link" \ - s\:socket \ + '*-type[true if the file is of the given type]:file type:((b\:"block (buffered) special" + c\:"character (unbuffered) special" + d\:directory + p\:"named pipe (FIFO)" + f\:"regular file" + l\:"symbolic link" + s\:socket D\:"door (Solaris)" e\:unknown))' '*-user[true if the file is owned by the given user]:user:_users' diff --git a/Completion/Unix/Command/_php b/Completion/Unix/Command/_php index 7688dd5..bbb6a66 100644 --- a/Completion/Unix/Command/_php +++ b/Completion/Unix/Command/_php @@ -31,7 +31,7 @@ args+=( '(- 1 *)'{-i,--info}'[PHP information]' '(- *)'{-l,--syntax-check}'[syntax check only (lint)]' '(- 1 *)'{-m,--modules}'[show compiled in modules]' - "(-r --run -f --file $exclusions -l --syntax-check -s --syntax-highlight -w --strip 1)"{-r,--run}'[run the specified PHP code without using script tags ]:PHP code:'\ + "(-r --run -f --file $exclusions -l --syntax-check -s --syntax-highlight -w --strip 1)"{-r,--run}'[run the specified PHP code without using script tags ]:PHP code:' '(- 1 *)'{-s,--syntax-highlight}'[display colour syntax highlighted source]' '(- 1 *)'{-v,--version}'[display version information]' '(- *)'{-w,--strip}'[display source with stripped comments and whitespace]' -- 1.7.4-rc1