diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2013-10-09 17:28:53 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2013-10-11 14:57:57 +0200 |
| commit | 6f921b91f475f77c1447fed4cada24235958b13d (patch) | |
| tree | 8a8802f80170567fd09a0a65de19d3058e2621e8 | |
| parent | fa033326357218652310c4510898be622b871c4f (diff) | |
| download | zsh-6f921b91f475f77c1447fed4cada24235958b13d.tar.gz zsh-6f921b91f475f77c1447fed4cada24235958b13d.tar.xz zsh-6f921b91f475f77c1447fed4cada24235958b13d.zip | |
31805: Update _enable and _disable for -p, fix related typo in docs
| -rw-r--r-- | Completion/Zsh/Command/_disable | 9 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_enable | 8 | ||||
| -rw-r--r-- | Doc/Zsh/builtins.yo | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Completion/Zsh/Command/_disable b/Completion/Zsh/Command/_disable index 3b627fb5f..68be75fd4 100644 --- a/Completion/Zsh/Command/_disable +++ b/Completion/Zsh/Command/_disable @@ -1,9 +1,10 @@ #compdef disable _arguments -C -s -A "-*" -S \ - "(-f -r -s)-a[act on regular or global aliases]:*:regular or global aliases:(${(k)aliases} ${(k)galiases})" \ - "(-a -r -s)-f[act on functions]:*:functions:(${(k)functions})" \ - "(-a -f -s)-r[act on reserved words]:*:reserved-words:compadd -k reswords" \ - "(-a -f -r)-s[act on suffix aliases]:*:suffix aliases:(${(k)saliases})" \ + "(-f -r -s -p)-a[act on regular or global aliases]:*:regular or global aliases:(${(k)aliases} ${(k)galiases})" \ + "(-a -r -s -p)-f[act on functions]:*:functions:(${(k)functions})" \ + "(-a -f -s -p)-r[act on reserved words]:*:reserved-words:compadd -k reswords" \ + "(-a -f -r -p)-s[act on suffix aliases]:*:suffix aliases:(${(k)saliases})" \ + "(-a -f -r -s)-p[act on pattern characters]:*:pattern characters:compadd -k patchars" \ '-m[treat arguments as patterns]' \ "*:builtin command:(${(k)builtins})" diff --git a/Completion/Zsh/Command/_enable b/Completion/Zsh/Command/_enable index c5f8b2c43..f7737823f 100644 --- a/Completion/Zsh/Command/_enable +++ b/Completion/Zsh/Command/_enable @@ -1,8 +1,10 @@ #compdef enable _arguments -C -s -A "-*" -S \ - "(-f -r)-a[act on aliases]:*:aliases:(${(k)dis_aliases})" \ - "(-a -r)-f[act on functions]:*:functions:(${(k)dis_functions})" \ - "(-a -f)-r[act on reserved words]:*:reserved-words:compadd -k dis_reswords" \ + "(-f -r -s -p)-a[act on regular or global aliases]:*:aliases:(${(k)dis_aliases} ${(k)dis_galiases})" \ + "(-a -r -s -p)-f[act on functions]:*:functions:(${(k)dis_functions})" \ + "(-a -f -s -p)-r[act on reserved words]:*:reserved-words:compadd -k dis_reswords" \ + "(-a -f -r -p)-s[act on suffix aliases]:*:suffix aliases:(${(k)dis_saliases})" \ + "(-a -f -r -s)-p[act on pattern characters]:*:pattern characters:compadd -k dis_patchars" \ '-m[treat arguments as patterns]' \ "*:builtin command:(${(k)dis_builtins})" diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index 8e46a88ee..2cc33d241 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -471,7 +471,7 @@ problems in scripts and functions are altered. If the tt(-L) switch is given, the options tt(LOCAL_OPTIONS), tt(LOCAL_PATTERNS) and tt(LOCAL_TRAPS) will be set as well, causing the effects of the tt(emulate) command and any tt(setopt), -tt(disable -p) or tt(enable -b), and tt(trap) commands to be local to +tt(disable -p) or tt(enable -p), and tt(trap) commands to be local to the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except tt(ksh). The tt(-L) switch is mutually exclusive with the |