From: dana <dana@dana.is>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: [PATCH] Completion: Fix various wording issues
Date: Wed, 24 Apr 2019 13:12:32 -0500 [thread overview]
Message-ID: <A7B034AF-F2D4-423D-9ABF-125826EF2245@dana.is> (raw)
Following again on workers/44242.
Patch #3: Fix various wording issues in these functions — 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+=(
- '-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+=(
- '(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=(
- '-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=0
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=0
;;
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
_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
_arguments -s -S $aopts \
$args \
- '*:directories:_directories'
+ '*: :_directories'
reply other threads:[~2019-04-24 18:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=A7B034AF-F2D4-423D-9ABF-125826EF2245@dana.is \
--to=dana@dana.is \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).