naruse	2017-03-11 22:23:42 +0900 (Sat, 11 Mar 2017)

  New Revision: 57841

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

  Log:
    merge revision(s) 57204:
    
            r57203 needs r57204.
    io.c: use io_close to close ARGF

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/io.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57840)
+++ ruby_2_4/version.h	(revision 57841)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-11"
-#define RUBY_PATCHLEVEL 9
+#define RUBY_PATCHLEVEL 10
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/io.c
===================================================================
--- ruby_2_4/io.c	(revision 57840)
+++ ruby_2_4/io.c	(revision 57841)
@@ -7986,7 +7986,7 @@ argf_close(VALUE argf) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L7986
     if (RB_TYPE_P(file, T_FILE)) {
 	rb_io_set_write_io(file, Qnil);
     }
-    rb_funcall3(file, rb_intern("close"), 0, 0);
+    io_close(file);
     ARGF.init_p = -1;
 }
 

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57204


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