Second merge from trunk.rexml_adds_tests

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/rexml_adds_tests@19455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 86681235a0..f457b072a9 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -632,7 +632,7 @@ class OptionParser
       list.each do |opt|
         if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
           opt.summarize(*args, &block)
-        elsif !opt
+        elsif !opt or opt.empty?
           yield("")
         elsif opt.respond_to?(:each_line)
           opt.each_line(&block)
@@ -1605,6 +1605,13 @@ class OptionParser
       argv
     end
 
+    def set_backtrace(array)
+      unless $DEBUG
+        array.delete_if(&%r"\A#{Regexp.quote(__FILE__)}:"o.method(:=~))
+      end
+      super(array)
+    end
+
     def set_option(opt, eq)
       if eq
         @args[0] = opt