From 04444e9535d4e95ba2cf9b9239f61153aa798d12 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 23 May 2002 05:54:23 +0000
Subject: [PATCH] * ruby.c (proc_options): -v should not print version if  
 proc_options called via moreswitches().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 ruby.c    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b3a6d86b72..6059908838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 23 14:52:32 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.c (proc_options): -v should not print version if
+	  proc_options called via moreswitches().
+
 Thu May 23 09:13:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.c (proc_options): removed "-*-" support for #! line.
diff --git a/ruby.c b/ruby.c
index 06ad8a48d3..16c58c72a7 100644
--- a/ruby.c
+++ b/ruby.c
@@ -438,7 +438,7 @@ proc_options(argc, argv)
 	    goto reswitch;
 
 	  case 'v':
-	    if (verbose) {
+	    if (argv0 == 0 || verbose) {
 		s++;
 		goto reswitch;
 	    }