about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2012-02-14 17:01:17 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2012-02-14 17:01:17 +0000
commit1fe821a8a12b209ee4a1f7034750043a803b6818 (patch)
tree5182fbaebed29c078590aab46073644fecfa81d6
parentf97a208aed62764a60500e07dee1bde4ee75f986 (diff)
downloadzsh-1fe821a8a12b209ee4a1f7034750043a803b6818.tar.gz
zsh-1fe821a8a12b209ee4a1f7034750043a803b6818.tar.xz
zsh-1fe821a8a12b209ee4a1f7034750043a803b6818.zip
30198: fix environ style lookup to be done in conventional manner
-rw-r--r--ChangeLog8
-rw-r--r--Completion/Unix/Command/_sudo2
-rw-r--r--Doc/Zsh/compsys.yo2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a2562ed70..2522c614c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2012-02-14  Oliver Kiddle  <opk@zsh.org>
 
-	* Mikael: fix dpkg-deb completion broken by 30199
+	* 30198: Completion/Unix/Command/_sudo, Doc/Zsh/compsys.yo:
+	fix environ style lookup to be done in conventional manner
+
+	* Mikael: Completion/Debian/Command/_dpkg: fix dpkg-deb
+	completion broken by 30199
 
 2012-02-14  Peter Stephenson  <pws@csr.com>
 
@@ -15981,5 +15985,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5585 $
+* $Revision: 1.5586 $
 *****************************************************
diff --git a/Completion/Unix/Command/_sudo b/Completion/Unix/Command/_sudo
index 384e9358b..f8543f865 100644
--- a/Completion/Unix/Command/_sudo
+++ b/Completion/Unix/Command/_sudo
@@ -3,7 +3,7 @@
 local curcontext="$curcontext" environ e
 local -a args
 
-zstyle -a "$curcontext" environ environ
+zstyle -a ":completion:${curcontext}:" environ environ
 
 for e in "${environ[@]}"
 do local -x "$e"
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 665c0d454..135a60a41 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1333,7 +1333,7 @@ item(tt(environ))(
 The environ style is used when completing for `tt(sudo)'.  It is set to an
 array of `var(VAR)tt(=)var(value)' assignments to be exported into the
 local environment before the completion for the target command is invoked.
-example(zstyle :complete:sudo: environ \ 
+example(zstyle ':completion:*:sudo::' environ \ 
   PATH="/sbin:/usr/sbin:$PATH" HOME="/root")
 )
 kindex(expand, completion style)