From 8446b6c59b3c9eb7c3b6c2163e1c7b26b9359e79 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 Jun 2006 14:28:49 +0000
Subject: * ext/extmk.rb (parse_args): provisional catch-up for the recent
 changes.

* lib/optparse.rb (OptionParser::List#summarize, OptionParser#order!): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/optparse.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/optparse.rb')

diff --git a/lib/optparse.rb b/lib/optparse.rb
index c79da48e01..6ecd7e3203 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -670,7 +670,7 @@ class OptionParser
       list.each do |opt|
         if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
           opt.summarize(*args, &block)
-        elsif opt.empty?
+        elsif !opt or opt.empty?
           yield("")
         else
           opt.each(&block)
@@ -1319,7 +1319,7 @@ class OptionParser
           end
           begin
             opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-            sw.yield(*val) if sw
+            sw.yield(val) if sw
           rescue ParseError
             raise $!.set_option(arg, rest)
           end
-- 
cgit v1.2.3