diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-09-22 11:43:17 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-09-22 21:02:45 +0000 |
| commit | 7ecc3f8b4efe89ac539201ddfce087dca4ad77a9 (patch) | |
| tree | 523813b0b638f0edd65abc4ffeac691f3f1b6771 | |
| parent | 4e51079f0bfc2fa0085376a56f3002370d90e99a (diff) | |
| download | zsh-7ecc3f8b4efe89ac539201ddfce087dca4ad77a9.tar.gz zsh-7ecc3f8b4efe89ac539201ddfce087dca4ad77a9.zip | |
39410: Fix unintentional history modifiers.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Completion/Darwin/Type/_retrieve_mac_apps | 4 | ||||
| -rw-r--r-- | Completion/Unix/Command/_dsh | 2 | ||||
| -rw-r--r-- | Completion/Unix/Type/_dates | 4 |
4 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2016-09-22 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 39410: Completion/Darwin/Type/_retrieve_mac_apps, + Completion/Unix/Command/_dsh, Completion/Unix/Type/_dates: + Fix unintentional history modifiers. + 2016-09-22 Adam Gibbins <adam@adamgibbins.com> * unposted: Completion/Unix/Command/_gpg: Correct typo diff --git a/Completion/Darwin/Type/_retrieve_mac_apps b/Completion/Darwin/Type/_retrieve_mac_apps index ba15577e8..f24d36c3c 100644 --- a/Completion/Darwin/Type/_retrieve_mac_apps +++ b/Completion/Darwin/Type/_retrieve_mac_apps @@ -71,7 +71,7 @@ _retrieve_mac_apps() { # Get application search method typeset retrieve - if ! zstyle -s ":completion:*:*:$service:commands" search-method retrieve + if ! zstyle -s ":completion:*:*:${service}:commands" search-method retrieve then if [[ -d /.Spotlight-V100 ]]; then # / is indexed to use Spotlight @@ -80,7 +80,7 @@ _retrieve_mac_apps() { # Fall back to the old way retrieve=_mac_apps_old_retrieve fi - zstyle ":completion:*:*:$service:commands" search-method $retrieve + zstyle ":completion:*:*:${service}:commands" search-method $retrieve fi # Get root directories to search applications diff --git a/Completion/Unix/Command/_dsh b/Completion/Unix/Command/_dsh index 8c5c23208..fc7680062 100644 --- a/Completion/Unix/Command/_dsh +++ b/Completion/Unix/Command/_dsh @@ -25,7 +25,7 @@ _arguments -s -C -S \ '*::args: _normal' && return if [[ $state = groups ]]; then - if ! zstyle -s ":completion:$curcontext:dsh-groups" dsh-groups grp; then + if ! zstyle -s ":completion:${curcontext}:dsh-groups" dsh-groups grp; then [[ -e ~/.dsh/group ]] && grp="~/.dsh/group" || return 1 fi _path_files -W ~/.dsh/group && return diff --git a/Completion/Unix/Type/_dates b/Completion/Unix/Type/_dates index e4fa62e48..0af10eb24 100644 --- a/Completion/Unix/Type/_dates +++ b/Completion/Unix/Type/_dates @@ -22,10 +22,10 @@ local future mlabel mfmt mlabels zparseopts -D -K -E f:=format F=future (( future = $#future ? 1 : -1 )) -zstyle -s ':completion:$curcontext:dates' date-format userformat +zstyle -s ":completion:${curcontext}:dates" date-format userformat format=${userformat:-${format[2]:-%F}} -zstyle -a ':completion:$curcontext:dates' max-matches-length r +zstyle -a ":completion:${curcontext}:dates" max-matches-length r for ri in $r; do [[ $ri = [0-9]##% ]] && (( ri = LINES * .${ri%%%} )) (( ri < rows )) && (( rows=ri )) |