summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordana <dana@dana.is>2018-01-03 18:14:05 -0600
committerOliver Kiddle <opk@zsh.org>2018-01-04 11:50:50 +0100
commit21a09a14181851e931f9b2b65704044eed169fb7 (patch)
tree5f586e42fa22381ec3302ed27ee77d6ff18f8fbc
parentc789efbaf0db016256d58c685c5586d7a684170d (diff)
downloadzsh-21a09a14181851e931f9b2b65704044eed169fb7.tar.gz
zsh-21a09a14181851e931f9b2b65704044eed169fb7.zip
42214: use less general names on new functions for completing file flags and modes
-rw-r--r--ChangeLog6
-rw-r--r--Completion/BSD/Command/_chflags2
-rw-r--r--Completion/BSD/Type/_file_flags (renamed from Completion/BSD/Type/_flags)0
-rw-r--r--Completion/Unix/Command/_chmod2
-rw-r--r--Completion/Unix/Command/_find2
-rw-r--r--Completion/Unix/Command/_mkdir2
-rw-r--r--Completion/Unix/Type/_file_modes (renamed from Completion/Unix/Type/_modes)0
7 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d51ad842..d7ab6fea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2018-01-04 Oliver Kiddle <okiddle@yahoo.co.uk>
+ * dana: 42214: Completion/BSD/Type/_file_flags,
+ Completion/Unix/Type/_file_modes, Completion/Unix/Command/_find,
+ Completion/Unix/Command/_mkdir, Completion/BSD/Command/_chflags,
+ Completion/Unix/Command/_chmod: use less general names on new
+ functions for completing file flags and modes
+
* github #21: Maciek Makowski:
Completion/Linux/Command/_networkmanager: update nmcli
completions to be compatible with recent version 1.8.4
diff --git a/Completion/BSD/Command/_chflags b/Completion/BSD/Command/_chflags
index f97d1cdd1..924b09acd 100644
--- a/Completion/BSD/Command/_chflags
+++ b/Completion/BSD/Command/_chflags
@@ -12,7 +12,7 @@ if [[ $OSTYPE = (darwin|dragonfly|freebsd)* ]]; then
fi
_arguments -s -A "-*" : $args \
- ': :_flags' \
+ ': :_file_flags' \
'*:file:_files "$own"' \
- opth \
'-h[act on symlinks]' \
diff --git a/Completion/BSD/Type/_flags b/Completion/BSD/Type/_file_flags
index 95044121c..95044121c 100644
--- a/Completion/BSD/Type/_flags
+++ b/Completion/BSD/Type/_file_flags
diff --git a/Completion/Unix/Command/_chmod b/Completion/Unix/Command/_chmod
index 80c6f33ca..af64b9eb9 100644
--- a/Completion/Unix/Command/_chmod
+++ b/Completion/Unix/Command/_chmod
@@ -3,7 +3,7 @@
local curcontext="$curcontext" state line expl ret=1
local -a args privs
-args=( '*: :->files' '1: :_modes' )
+args=( '*: :->files' '1: :_file_modes' )
if _pick_variant gnu=Free\ Soft unix --version; then
args+=(
diff --git a/Completion/Unix/Command/_find b/Completion/Unix/Command/_find
index 2bfb89825..edd46ac1c 100644
--- a/Completion/Unix/Command/_find
+++ b/Completion/Unix/Command/_find
@@ -139,7 +139,7 @@ _arguments -C $args \
'*-nogroup' \
'*-nouser' \
'*-ok:program: _command_names -e:*\;::program arguments: _normal' \
- '*-perm: :_modes' \
+ '*-perm: :_file_modes' \
'*-print' \
'*-prune' \
'*-size:file size (blocks)' \
diff --git a/Completion/Unix/Command/_mkdir b/Completion/Unix/Command/_mkdir
index 830a96162..53536b01d 100644
--- a/Completion/Unix/Command/_mkdir
+++ b/Completion/Unix/Command/_mkdir
@@ -4,7 +4,7 @@ local curcontext="$curcontext" state line expl args variant ret=1
typeset -A opt_args
args=(
- '(-m --mode)'{-m,--mode=}'[set permission mode]: :_modes'
+ '(-m --mode)'{-m,--mode=}'[set permission mode]: :_file_modes'
'(-p --parents)'{-p,--parents}'[make parent directories as needed]'
'(-)*: :->directories'
)
diff --git a/Completion/Unix/Type/_modes b/Completion/Unix/Type/_file_modes
index fbe4c9363..fbe4c9363 100644
--- a/Completion/Unix/Type/_modes
+++ b/Completion/Unix/Type/_file_modes