diff options
Diffstat (limited to 'Completion/Zsh')
| -rw-r--r-- | Completion/Zsh/Command/_typeset | 4 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_zstyle | 2 | ||||
| -rw-r--r-- | Completion/Zsh/Context/_brace_parameter | 3 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_globquals | 7 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_parameters | 5 |
5 files changed, 16 insertions, 5 deletions
diff --git a/Completion/Zsh/Command/_typeset b/Completion/Zsh/Command/_typeset index 0920e3fb5..f876e1beb 100644 --- a/Completion/Zsh/Command/_typeset +++ b/Completion/Zsh/Command/_typeset @@ -91,13 +91,13 @@ if [[ "$state" = vars_eq ]]; then _wanted functions expl 'shell function' compadd -a args elif [[ -n $onopts$offopts ]]; then if [[ -n $offopts ]]; then - args=(${(f)"$(functions +$offopts)"}) + args=(${(f)"$(functions +${offopts//[^UXkmtTuz]/})"}) else args=(${(k)functions}) fi if [[ -n $onopts ]]; then local -a funckeys - funckeys=(${(f)"$(functions +$onopts)"}) + funckeys=(${(f)"$(functions +${onopts//[^UXkmtTuz]/})"}) args=(${args:|funckeys}) fi if zstyle -t ":completion:${curcontext}:functions" prefix-needed && diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle index 708c0fddf..eb27117b2 100644 --- a/Completion/Zsh/Command/_zstyle +++ b/Completion/Zsh/Command/_zstyle @@ -182,6 +182,8 @@ styles=( disable v:vcs disable-patterns v: check-for-changes v:bool + check-for-staged-changes + v:bool stagedstr v: unstagedstr v: command v:_command_names diff --git a/Completion/Zsh/Context/_brace_parameter b/Completion/Zsh/Context/_brace_parameter index c0ecf251b..2aeb12bf4 100644 --- a/Completion/Zsh/Context/_brace_parameter +++ b/Completion/Zsh/Context/_brace_parameter @@ -185,6 +185,9 @@ if [[ $PREFIX = *'${('[^\)]# ]]; then ) _describe -t flags "parameter flag" flags -Q -S '' return +elif compset -P '*:'; then + _history_modifiers p + return fi _parameters -e diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals index 9de7742ff..37db161d0 100644 --- a/Completion/Zsh/Type/_globquals +++ b/Completion/Zsh/Type/_globquals @@ -132,13 +132,13 @@ while [[ -n $PREFIX ]]; do (L) # complete/skip file size - if ! compset -P '([kKmMpP]|)([-+]|)<->'; then + if ! compset -P '([kKmMgGtTpP]|)([-+]|)<->'; then # complete/skip size spec alts=() - if ! compset -P '[kKmMpP]' && [[ -z $PREFIX ]]; then + if ! compset -P '[kKmMgGtTpP]' && [[ -z $PREFIX ]]; then alts+=( "size-specifiers:size specifier:\ -((k\:kb m\:mb p\:512-byte\ blocks))") +((k\:kb m\:mb g\:gb t\:tb p\:512-byte\ blocks))") fi if ! compset -P '[-+]' && [[ -z $PREFIX ]]; then alts+=("senses:sense:((-\:less\ than +\:more\ than))") @@ -251,6 +251,7 @@ case $state in "o:+ sort order, up" "O:+ sort order, down" "P:prepend word" + "Y:+ at most ARG matches" "[:+ range of files" "):end of qualifiers" "\::modifier" diff --git a/Completion/Zsh/Type/_parameters b/Completion/Zsh/Type/_parameters index 5156e3e2d..eaad3ca9d 100644 --- a/Completion/Zsh/Type/_parameters +++ b/Completion/Zsh/Type/_parameters @@ -8,6 +8,11 @@ local expl pattern fakes faked tmp pfilt +if compset -P '*:'; then + _history_modifiers p + return +fi + pattern=(-g \*) zparseopts -D -K -E g:=pattern |