summaryrefslogtreecommitdiff
path: root/Completion/Zsh
diff options
context:
space:
mode:
Diffstat (limited to 'Completion/Zsh')
-rw-r--r--Completion/Zsh/Command/_compadd6
-rw-r--r--Completion/Zsh/Command/_strftime6
-rw-r--r--Completion/Zsh/Context/_brace_parameter2
-rw-r--r--Completion/Zsh/Type/_module_math_func13
4 files changed, 16 insertions, 11 deletions
diff --git a/Completion/Zsh/Command/_compadd b/Completion/Zsh/Command/_compadd
index a7036d027..e709e400e 100644
--- a/Completion/Zsh/Command/_compadd
+++ b/Completion/Zsh/Command/_compadd
@@ -14,9 +14,9 @@ _arguments -C -s -S -A "-*" \
'(-a)-k[matches are keys of specified associative arrays]' \
'-d+[specify display strings]:array:_parameters -g "*array*"' \
'-l[list display strings one per line, not in columns]' \
- '-o[order matches by display string not by match string]' \
- '(-1 -E)-J+[specify match group]:group' \
- '-V+[specify unsorted match group]:group' \
+ '-o[order matches by match string not by display string]' \
+ '(-1 -E)-J+[specify match group which will be sorted]:group' \
+ '-V+[specify pre-ordered match group]:group' \
'(-J -E)-1[remove only consecutive duplicates from group]' \
'-2[preserve all duplicates]' \
'(-x)-X[specify explanation]:explanation' \
diff --git a/Completion/Zsh/Command/_strftime b/Completion/Zsh/Command/_strftime
index 24ff7dc3e..0849f1c85 100644
--- a/Completion/Zsh/Command/_strftime
+++ b/Completion/Zsh/Command/_strftime
@@ -4,9 +4,11 @@ local ret=1 expl
_arguments -S -A '-*' -s \
'-q[run quietly]' \
- '-r[reverse lookup using strptime]' \
+ '(3)-r[reverse lookup using strptime]' \
'-s+[assign result to parameter]:param:_parameters' \
'1:format: _date_formats zsh' \
- '2:epoch time (or date string with -r)' && ret=0
+ '2:epoch time (or date string with -r)' \
+ '3:nanoseconds' \
+&& ret=0
return ret
diff --git a/Completion/Zsh/Context/_brace_parameter b/Completion/Zsh/Context/_brace_parameter
index 4ba588cc0..5b70ab0ca 100644
--- a/Completion/Zsh/Context/_brace_parameter
+++ b/Completion/Zsh/Context/_brace_parameter
@@ -140,7 +140,7 @@ if [[ $PREFIX = *'${('[^\)]# ]]; then
fi
flags+=(
"#:evaluate as numeric expression"
- "@:double-quoted splitting of scalars"
+ "@:prevent double-quoted joining of arrays"
"A:assign as an array parameter"
"a:sort in array index order (with O to reverse)"
"b:backslash quote pattern characters only"
diff --git a/Completion/Zsh/Type/_module_math_func b/Completion/Zsh/Type/_module_math_func
index 6be9c006a..5044bdf4c 100644
--- a/Completion/Zsh/Type/_module_math_func
+++ b/Completion/Zsh/Type/_module_math_func
@@ -1,9 +1,12 @@
#autoload
-local expl
-local -a funcs
+local mod
+local -a funcs alts
+local -a modules=( example mathfunc system )
-funcs=(${${${(f)"$(zmodload -Fl zsh/mathfunc 2>/dev/null)"}:#^+f:*}##+f:})
+for mod in $modules; do
+ funcs=( ${${${(f)"$(zmodload -Fl zsh/$mod 2>/dev/null)"}:#^+f:*}##+f:} )
+ alts+=( "module-math-functions.${mod}:math function from zsh/${mod}:compadd -S '(' $funcs" )
+done
-_wanted module-math-functions expl 'math function from zsh/mathfunc' \
- compadd -S '(' -q "$@" -a funcs
+_alternative $alts