diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-01-28 19:13:39 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-01-28 19:13:39 -0800 |
| commit | 8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c (patch) | |
| tree | 9c8b60e4f8acefdab3045f9d656b8cfd804399c6 /Completion | |
| parent | a2098b0b26b47917cc725b387c63d75dfe0098f2 (diff) | |
| parent | 584ea888115e48da43b01b5f5a7e1511a469f081 (diff) | |
| download | zsh-8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c.tar.gz zsh-8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c.tar.xz zsh-8d3d34cfa46c1bfdd0e473e3942edfa45f66e47c.zip | |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Zsh/Context/_brace_parameter | 3 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_parameters | 5 |
2 files changed, 8 insertions, 0 deletions
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/_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 |