summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-06-05 11:18:01 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-06-05 11:18:01 +0000
commitdfabf50cf1ee78d5a1849fd19409ee23150506c4 (patch)
tree4bb12a54d1abf40ef4378ea79a2ef6d66e34a468
parent72529e4fa606e9ccb6b9200df2d696782c742ac7 (diff)
downloadzsh-dfabf50cf1ee78d5a1849fd19409ee23150506c4.tar.gz
zsh-dfabf50cf1ee78d5a1849fd19409ee23150506c4.tar.xz
zsh-dfabf50cf1ee78d5a1849fd19409ee23150506c4.zip
27305: fix GNU man option handling in run-help
-rw-r--r--ChangeLog5
-rw-r--r--Functions/Misc/run-help5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6aed3f6c0..f39330d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-05  Peter Stephenson  <pws@csr.com>
 
+	* 27305: Functions/Misc/run-help: use POSIXLY_CORRECT with man
+	to avoid GNU man grabbing options in the argument list.
+
 	* 27304: Doc/Zsh/expn.yo, Src/subst.c, Src/utils.c, Src/zsh.h,
 	Test/D04parameter.ztst:  add ${(q-)...} flag to do minimal
 	quoting of arguments with no unnecessary single quotes.
@@ -11834,5 +11837,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4713 $
+* $Revision: 1.4714 $
 *****************************************************
diff --git a/Functions/Misc/run-help b/Functions/Misc/run-help
index f5464065d..837ce1ff0 100644
--- a/Functions/Misc/run-help
+++ b/Functions/Misc/run-help
@@ -8,8 +8,7 @@
 #	autoload run-help
 #
 
-emulate -R zsh
-setopt localoptions
+emulate -RL zsh
 
 local HELPDIR="${HELPDIR:-/usr/share/zsh/$ZSH_VERSION/help}"
 
@@ -103,7 +102,7 @@ do
 		done
 		eval "run-help-$1:t ${(q@)cmd_args[2,-1]}"
 	    else
-		man $@:t
+		POSIXLY_CORRECT=1 man $@:t
 	    fi
 	fi
 	;;