naruse	2017-03-12 02:40:39 +0900 (Sun, 12 Mar 2017)

  New Revision: 57867

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

  Log:
    merge revision(s) 57405:
    
    error.c: fixed doc [ci skip]
    
    * error.c (exc_message): fixed doc regarding the presence of
      to_str.  [Fix GH-1517]
    
    Author:    Marc Gauthier <marcg.gauthier@g...>

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/error.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/error.c
===================================================================
--- ruby_2_4/error.c	(revision 57866)
+++ ruby_2_4/error.c	(revision 57867)
@@ -880,9 +880,7 @@ exc_to_s(VALUE exc) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/error.c#L880
  *   exception.message   ->  string
  *
  * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name. By
- * supplying a to_str method, exceptions are agreeing to
- * be used where Strings are expected.
+ * Normally this returns the exception's message or name.
  */
 
 static VALUE
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57866)
+++ ruby_2_4/version.h	(revision 57867)
@@ -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-12"
-#define RUBY_PATCHLEVEL 32
+#define RUBY_PATCHLEVEL 33
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

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


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