naruse	2012-04-24 21:20:52 +0900 (Tue, 24 Apr 2012)

  New Revision: 35463

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

  Log:
    merge revision(s) 35462:
    
    * lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
      and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
      [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/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35462)
+++ ruby_1_9_3/ChangeLog	(revision 35463)
@@ -1,3 +1,9 @@
+Tue Apr 24 21:20:39 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
+	  and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
+	  [ruby-dev:45568][Bug #6348]
+
 Tue Apr 24 14:55:41 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
Index: ruby_1_9_3/lib/optparse.rb
===================================================================
--- ruby_1_9_3/lib/optparse.rb	(revision 35462)
+++ ruby_1_9_3/lib/optparse.rb	(revision 35463)
@@ -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 35462)
+++ ruby_1_9_3/version.h	(revision 35463)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 198
+#define RUBY_PATCHLEVEL 199
 
 #define RUBY_RELEASE_DATE "2012-04-24"
 #define RUBY_RELEASE_YEAR 2012

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