usa	2018-03-18 23:58:07 +0900 (Sun, 18 Mar 2018)

  New Revision: 62817

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62817

  Log:
    merge revision(s) 59970: [Backport #13736]
    
    ruby.c: paragraph mode by -00
    
    * ruby.c (proc_options): set to paragraph mode, if -00 is given,
      as well as perl and -R0 option in 0.49.
      [ruby-core:81987] [Bug #13736]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/ruby.c
    branches/ruby_2_3/test/ruby/test_rubyoptions.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62816)
+++ ruby_2_3/version.h	(revision 62817)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-03-18"
-#define RUBY_PATCHLEVEL 418
+#define RUBY_PATCHLEVEL 419
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_3/ruby.c
===================================================================
--- ruby_2_3/ruby.c	(revision 62816)
+++ ruby_2_3/ruby.c	(revision 62817)
@@ -1077,7 +1077,7 @@ proc_options(long argc, char **argv, str https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ruby.c#L1077
 		if (v > 0377)
 		    rb_rs = Qnil;
 		else if (v == 0 && numlen >= 2) {
-		    rb_rs = rb_str_new2("\n\n");
+		    rb_rs = rb_str_new2("");
 		}
 		else {
 		    c = v & 0xff;
Index: ruby_2_3/test/ruby/test_rubyoptions.rb
===================================================================
--- ruby_2_3/test/ruby/test_rubyoptions.rb	(revision 62816)
+++ ruby_2_3/test/ruby/test_rubyoptions.rb	(revision 62817)
@@ -170,6 +170,8 @@ class TestRubyOptions < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_rubyoptions.rb#L170
     assert_in_out_err(%w(-0141 -e) + ["print gets"], "foo\nbar\0baz", %w(foo ba), [])
 
     assert_in_out_err(%w(-0e) + ["print gets"], "foo\nbar\0baz", %W(foo bar\0), [])
+
+    assert_in_out_err(%w(-00 -e) + ["p gets, gets"], "foo\nbar\n\n\n\nbaz\n", %w("foo\nbar\n\n" "baz\n"), [])
   end
 
   def test_autosplit
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62816)
+++ ruby_2_3/ChangeLog	(revision 62817)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Mar 18 23:57:32 2018  Nobuyoshi Nakada  <nobu@r...>
+
+	ruby.c: paragraph mode by -00
+
+	* ruby.c (proc_options): set to paragraph mode, if -00 is given, as
+	  well as perl and -R0 option in 0.49. [Bug #13736]
+
 Sun Mar 18 23:55:23 2018  Eric Wong  <normalperson@y...>
 
 	process: block/unblock signals around fork
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62816)
+++ ruby_2_3	(revision 62817)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r59970

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