about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2015-05-25 16:53:04 +0200
committerDaniel Hahler <git@thequod.de>2015-05-27 19:38:05 +0200
commit6925e2b298ea02c1b8fb50f116167761cd0bd153 (patch)
tree1384c84381e79d17d685829775208ba875e4d92f
parentf08042943917b9381e56f387fe0a20f1933a4024 (diff)
downloadzsh-6925e2b298ea02c1b8fb50f116167761cd0bd153.tar.gz
zsh-6925e2b298ea02c1b8fb50f116167761cd0bd153.tar.xz
zsh-6925e2b298ea02c1b8fb50f116167761cd0bd153.zip
35286: fix zstyle lookups with _baz and _tla
Add trailing colons to context being used with `zstyle -s`.
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_baz4
-rw-r--r--Completion/Unix/Command/_tla4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dd8a2453a..f8be2e5a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* 35285: Functions/Chpwd/_cdr: fix zstyle lookup for
 	recent-dirs-insert.
 
+	* 35286: Completion/Unix/Command/_baz, Completion/Unix/Command/_tla:
+	fix zstyle lookups with _baz and _tla.
+
 2015-05-27  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Han Pingtian: 35299: Functions/Zftp/zfdir: improve effect of
diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz
index 132c6e31d..6787f41e2 100644
--- a/Completion/Unix/Command/_baz
+++ b/Completion/Unix/Command/_baz
@@ -6,13 +6,13 @@ local baz_version
 local hide_short
 
 # ask the user which version of baz this is
-if ! zstyle -s ":completion:${curcontext}" baz-version baz_version; then
+if ! zstyle -s ":completion:${curcontext}:" baz-version baz_version; then
   # ask baz instead
   baz_version="${${$($BAZ --version)#baz Bazaar version }%% \(thelove@canonical.com*}"
 fi
 
 # test whether to hide short options from completion
-if zstyle -s ":completion:${curcontext}" hide-shortopts hide_short; then
+if zstyle -s ":completion:${curcontext}:" hide-shortopts hide_short; then
   case $hide_short in
     true|yes|on|1) hide_short='!' ;;
     *) hide_short='' ;;
diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla
index 358a6a736..1e4cdd8d9 100644
--- a/Completion/Unix/Command/_tla
+++ b/Completion/Unix/Command/_tla
@@ -6,7 +6,7 @@ local tla_version
 local hide_short
 
 # ask the user which version of tla this is
-if ! zstyle -s ":completion:${curcontext}" tla-version tla_version; then
+if ! zstyle -s ":completion:${curcontext}:" tla-version tla_version; then
   # ask tla instead
   tla_version="$($TLA --version)"
   if [[ "${${(f)tla_version}[1]}" == The\ GNU\ Arch\ Revision\ Control\ System\ \(tla\)\ (#b)([0-9.]##) ]]; then
@@ -18,7 +18,7 @@ if ! zstyle -s ":completion:${curcontext}" tla-version tla_version; then
 fi
 
 # test whether to hide short options from completion
-if zstyle -s ":completion:${curcontext}" hide-shortopts hide_short; then
+if zstyle -s ":completion:${curcontext}:" hide-shortopts hide_short; then
   case $hide_short in
     true|yes|on|1) hide_short='!' ;;
     *) hide_short='' ;;