diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2018-12-24 04:40:22 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2018-12-24 04:40:22 +0100 |
| commit | bf8b7f713a5b04a191f4596fb86bbbfca0a855ce (patch) | |
| tree | b647a8dc990c8c845b8a8eca7bf92fbbf17e1fb5 /Completion/Zsh/Command | |
| parent | 06946d431a4426c6e5dffec1d7edb17c1dbd467c (diff) | |
| parent | 9dbde9e9c7d22ee0d301e4a2fecf97906d1ddce9 (diff) | |
| download | zsh-bf8b7f713a5b04a191f4596fb86bbbfca0a855ce.tar.gz zsh-bf8b7f713a5b04a191f4596fb86bbbfca0a855ce.zip | |
New upstream release candidate 5.6.2-test-2
Merge branch 'upstream' at 'zsh-5.6.2-test-2' into branch debian
Diffstat (limited to 'Completion/Zsh/Command')
| -rw-r--r-- | Completion/Zsh/Command/_compadd | 6 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_strftime | 6 |
2 files changed, 7 insertions, 5 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 |