nobu	2012-04-25 05:57:07 +0900 (Wed, 25 Apr 2012)

  New Revision: 35469

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35469

  Log:
    merge revision(s) 35467:
    
    * lib/optparse.rb (OptionParser#to_a): split for each lines.
      [ruby-dev:45568][Bug #6348]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/optparse.rb
    branches/ruby_1_9_3/test/optparse/test_summary.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35468)
+++ ruby_1_9_3/ChangeLog	(revision 35469)
@@ -1,3 +1,8 @@
+Wed Apr 25 05:56:56 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser#to_a): split for each lines.
+	  [ruby-dev:45568][Bug #6348]
+
 Tue Apr 24 21:20:39 2012  NARUSE, Yui  <naruse@r...>
 
 	* lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
Index: ruby_1_9_3/lib/optparse.rb
===================================================================
--- ruby_1_9_3/lib/optparse.rb	(revision 35468)
+++ ruby_1_9_3/lib/optparse.rb	(revision 35469)
@@ -1071,7 +1071,7 @@
   #
   # Returns option summary list.
   #
-  def to_a; summarize("#{banner}".split) end
+  def to_a; summarize("#{banner}".split(/^/)) end
 
   #
   # Checks if an argument is given twice, in which case an ArgumentError is
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35468)
+++ ruby_1_9_3/version.h	(revision 35469)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_PATCHLEVEL 200
 
-#define RUBY_RELEASE_DATE "2012-04-24"
+#define RUBY_RELEASE_DATE "2012-04-25"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/optparse/test_summary.rb
===================================================================
--- ruby_1_9_3/test/optparse/test_summary.rb	(revision 35468)
+++ ruby_1_9_3/test/optparse/test_summary.rb	(revision 35469)
@@ -33,6 +33,6 @@
   def test_summary
     o = OptionParser.new("foo\nbar")
     assert_equal("foo\nbar\n", o.to_s)
-    assert_equal(["foo", "bar"], o.to_a)
+    assert_equal(["foo\n", "bar"], o.to_a)
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/