From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id dc07c25a for ; Wed, 24 Apr 2019 18:13:20 +0000 (UTC) Received: (qmail 26550 invoked by alias); 24 Apr 2019 18:13:09 -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: 44251 Received: (qmail 15079 invoked by uid 1010); 24 Apr 2019 18:13:09 -0000 X-Qmail-Scanner-Diagnostics: from mail-it1-f196.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.1/25426. spamassassin: 3.4.2. Clear:RC:0(209.85.166.196):SA:0(-2.1/5.0):. Processed in 3.919946 secs); 24 Apr 2019 18:13:09 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.166.196 as permitted sender) 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=lmebpcRKoecNve2P6pE80WA++oYoo8Nf9wcMVNU00aU=; b=DD7Z+NjYE42OvgDmjkzsFK3pyd4Fq3JOdANqgnaA3MqNgyP+u2j4MtOOFI6Frq19yY 77RuIbhgeGiSCv5X3celP60+yox+izXmBFcTpwuhJsGiYZOGH63Z31hhv+TozNQ9EDec umWkPIeYrviRfU/qMyzYBcMC9AXOldWM+n3OWU35Adcn9YfxLRET4iR2FRT0FwEd1o9R exPw6YZWa2qfIRY7Uj4utUFjBKDt3XjBUQRjWssN9IVg0ThY6uUn8Rk/rQKDpkCoAAJB LW7qmco7VU98SKTzJMUFIUE6k3+WQ0A3qqZP4g0YorvG4oEYgr2nvT9EEMIozYsOvVDk mmYQ== 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=lmebpcRKoecNve2P6pE80WA++oYoo8Nf9wcMVNU00aU=; b=St2aD7bl6pyuLnL6JTmWO9Q2dKqOdQVES19+Z7TBaJWyNRbvUWuQDMgZd3Sl4vDmjr rk0qw9xSr4UaAoTZCVn8W18Z4UQU2iSZaCJ1zU1n+5ipKYmHPIjXDBxSk0ofFgV0bV+o nIX/s52Fb0nWKPrYYcMa628bztZku4619iOBF+KM0skgXeMA61R6+DQDQU8V8XtoHiz6 8ZFzY5LHS4qCKzIh2pSroX0rZkpEt3EuFOd73+5Zg1Q/rAXUGmq2UKMxd/R7Mvkmwc7k RSknYOZ8uF2hkCANb5Jm5aXiEibw9p0IDljfaP20RfaHbwfVZYsvtGHC/a6dtIM0X3EO evNg== X-Gm-Message-State: APjAAAV+oyYvRaHemLg6svRW4OjxE6agr3D5R1n2ebmS3GHfYPhEomsd 0xgOY3QmMQK8XWdCihHnVsVt6q7xE+5kRA== X-Google-Smtp-Source: APXvYqz3JWyYPKlipBvvO1gQJDB1FBJpbF3L7tYXjFWz+sMFYlbj56rQuX5jiaBWfsxVyPe//a1ezQ== X-Received: by 2002:a24:3c4c:: with SMTP id m73mr350608ita.23.1556129553267; Wed, 24 Apr 2019 11:12:33 -0700 (PDT) From: dana Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: [PATCH] Completion: Fix various wording issues Message-Id: Date: Wed, 24 Apr 2019 13:12:32 -0500 To: Zsh hackers list X-Mailer: Apple Mail (2.3445.9.1) Following again on workers/44242. Patch #3: Fix various wording issues in these functions =E2=80=94 = eliminate redundant labels, correct misspellings, generally make things more consistent. The last issue i noticed with these is that _mkdir offers symbolic mode completion for zf_mkdir (_chmod special-cases zf_chown, so it doesn't = have the same issue). We could just special-case that again, but maybe it'd be = more robust if we gave _file_modes an option that tells it to only offer = octal modes. That way, it'd always be consistent across functions dana diff --git a/Completion/Unix/Command/_chmod = b/Completion/Unix/Command/_chmod index f72055b17..3f6db7e91 100644 --- a/Completion/Unix/Command/_chmod +++ b/Completion/Unix/Command/_chmod @@ -43,7 +43,7 @@ case "$variant" in ;| freebsd*|netbsd*|darwin*|dragonfly*) args+=3D( - '-h[operate on symlinks them self]' + '-h[operate on symlinks themselves]' ) ;| freebsd*|openbsd*|netbsd*|darwin*|dragonfly*) @@ -55,11 +55,11 @@ case "$variant" in ;| darwin*) args+=3D( - '(1)-C[returns false if any of the named files have ACLs]' + '(1)-C[return false if any specified files have ACLs]' '(1)-N[remove ACLs from specified files]' - '(1)-E[read ACL info from stdin as a sequential list of ACEs]' - '(1)-i[removes inherited bit from all entries in named files = ACLs]' - '(1)-I[removes all inherited entries from named files ACLs]' + '(1)-E[read ACL info from stdin as sequential list of ACEs]' + "(1)-i[remove inherited bit from all entries in specified files' = ACLs]" + "(1)-I[remove all inherited entries from specified files' ACLs]" ) ;; esac diff --git a/Completion/Unix/Command/_chown = b/Completion/Unix/Command/_chown index 849607448..9ebbf7bab 100644 --- a/Completion/Unix/Command/_chown +++ b/Completion/Unix/Command/_chown @@ -27,7 +27,7 @@ case "$variant" in ;; *) args=3D( - '-h[operate on symlinks them self]' + '-h[operate on symlinks themselves]' '-R[change files and directories recursively]' ) ;| diff --git a/Completion/Unix/Command/_mkdir = b/Completion/Unix/Command/_mkdir index e5c99a1e1..0ae6be14b 100644 --- a/Completion/Unix/Command/_mkdir +++ b/Completion/Unix/Command/_mkdir @@ -40,7 +40,7 @@ _arguments -C -s -S $aopts $args && ret=3D0 case "$state" in directories) _wanted directories expl \ - 'parent directory (alternatively specify name of directory)' \ + 'parent directory or name of directory to create' \ _path_files -/ && ret=3D0 ;; esac diff --git a/Completion/Unix/Command/_mv b/Completion/Unix/Command/_mv index 027b2e68c..84e43d47e 100644 --- a/Completion/Unix/Command/_mv +++ b/Completion/Unix/Command/_mv @@ -52,4 +52,4 @@ case $variant; in esac =20 _arguments -s -S $aopts $args \ - '*:file:_files' + '*: :_files' diff --git a/Completion/Unix/Command/_rmdir = b/Completion/Unix/Command/_rmdir index d330e0aef..501ffb1cc 100644 --- a/Completion/Unix/Command/_rmdir +++ b/Completion/Unix/Command/_rmdir @@ -29,4 +29,4 @@ esac =20 _arguments -s -S $aopts \ $args \ - '*:directories:_directories' + '*: :_directories'