nagachika	2014-10-15 23:06:27 +0900 (Wed, 15 Oct 2014)

  New Revision: 47944

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

  Log:
    merge revision(s) r47820: [Backport #10330]
    
    * error.c: update exception tree. [DOC]
      reported by @hemge via twitter.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/error.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47943)
+++ ruby_2_1/ChangeLog	(revision 47944)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Oct 15 22:46:52 2014  NAKAMURA Usaku  <usa@r...>
+
+	* error.c: update exception tree. [DOC]
+	  reported by @hemge via twitter.
+
 Wed Sep 24 02:30:55 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parse_ident): just after a label, new expression should
Index: ruby_2_1/error.c
===================================================================
--- ruby_2_1/error.c	(revision 47943)
+++ ruby_2_1/error.c	(revision 47944)
@@ -1740,14 +1740,18 @@ syserr_eqq(VALUE self, VALUE exc) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/error.c#L1740
  *    * LoadError
  *    * NotImplementedError
  *    * SyntaxError
+ *  * SecurityError
  *  * SignalException
  *    * Interrupt
  *  * StandardError -- default for +rescue+
  *    * ArgumentError
- *    * IndexError
- *      * StopIteration
+ *    * EncodingError
+ *    * FiberError
  *    * IOError
  *      * EOFError
+ *    * IndexError
+ *      * KeyError
+ *      * StopIteration
  *    * LocalJumpError
  *    * NameError
  *      * NoMethodError
@@ -1755,14 +1759,13 @@ syserr_eqq(VALUE self, VALUE exc) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/error.c#L1759
  *      * FloatDomainError
  *    * RegexpError
  *    * RuntimeError -- default for +raise+
- *    * SecurityError
  *    * SystemCallError
  *      * Errno::*
- *    * SystemStackError
  *    * ThreadError
  *    * TypeError
  *    * ZeroDivisionError
  *  * SystemExit
+ *  * SystemStackError
  *  * fatal -- impossible to rescue
  */
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47943)
+++ ruby_2_1/version.h	(revision 47944)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
-#define RUBY_RELEASE_DATE "2014-09-24"
-#define RUBY_PATCHLEVEL 247
+#define RUBY_RELEASE_DATE "2014-10-15"
+#define RUBY_PATCHLEVEL 248
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47820


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