naruse	2018-03-20 18:39:52 +0900 (Tue, 20 Mar 2018)

  New Revision: 62859

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

  Log:
    merge revision(s) 62734: [Backport #14613]
    
    Add missing class FrozenError to Exception subclasses list documentation
    
    [Fix GH-1818]
    
    From: Miguel Landaeta <miguel@m...>

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/error.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/error.c
===================================================================
--- ruby_2_5/error.c	(revision 62858)
+++ ruby_2_5/error.c	(revision 62859)
@@ -2234,6 +2234,7 @@ syserr_eqq(VALUE self, VALUE exc) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/error.c#L2234
  *      * FloatDomainError
  *    * RegexpError
  *    * RuntimeError -- default for +raise+
+ *      * FrozenError
  *    * SystemCallError
  *      * Errno::*
  *    * ThreadError
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 62858)
+++ ruby_2_5/version.h	(revision 62859)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.0"
 #define RUBY_RELEASE_DATE "2018-03-20"
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 62858)
+++ ruby_2_5	(revision 62859)

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

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