about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-12-07 15:10:48 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-12-07 15:10:48 +0000
commit72d1045da5f38380a8b4bd6fcb02baac21e0a4cf (patch)
tree53f12aa3a6d5977d26b00972d18675729f7931fd
parentc66f52bad9d5aac4a5b6dce95623a2576f9fc045 (diff)
downloadzsh-72d1045da5f38380a8b4bd6fcb02baac21e0a4cf.tar.gz
zsh-72d1045da5f38380a8b4bd6fcb02baac21e0a4cf.tar.xz
zsh-72d1045da5f38380a8b4bd6fcb02baac21e0a4cf.zip
unposted: remove users/15622 _pick_variant change
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Base/Utility/_pick_variant2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e7fdcd41..63cb77eb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-07  Peter Stephenson  <pws@csr.com>
+
+	* unposted: remove users/15622 which causes problems
+	with certain existing forms of testing commands.
+
 2010-12-06  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	*  Mikael: 28480: Doc/Zsh/params.yo, Src/utils.c: allow
@@ -13925,5 +13930,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5145 $
+* $Revision: 1.5146 $
 *****************************************************
diff --git a/Completion/Base/Utility/_pick_variant b/Completion/Base/Utility/_pick_variant
index 3bf848271..01fa2b98f 100644
--- a/Completion/Base/Utility/_pick_variant
+++ b/Completion/Base/Utility/_pick_variant
@@ -7,7 +7,7 @@ local -A opts
 (( $+_cmd_variant )) || typeset -gA _cmd_variant
 
 zparseopts -D -A opts c: r:
-: ${opts[-c]:=${service:-$words[1]}}
+: ${opts[-c]:=$words[1]}
 
 while [[ $1 = *=* ]]; do
   var+=( "${1%%\=*}" "${1#*=}" )