usa	2016-12-27 19:32:51 +0900 (Tue, 27 Dec 2016)

  New Revision: 57213

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

  Log:
    merge revision(s) 56928: [Backport #12991]
    
    thread.c: fix doc of abort_on_exception [ci skip]
    
    * thread.c (rb_thread_s_abort_exc, rb_thread_s_abort_exc_set):
      [DOC] the raised exception will be re-raised in the main thread,
      and then follows the ordinary exception sequence, exit status is
      not 0.  [ruby-core:78415] [Bug #12991]
    
    * thread.c (rb_thread_abort_exc_set): ditto.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/thread.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 57212)
+++ ruby_2_2/ChangeLog	(revision 57213)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Dec 27 19:32:03 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread.c (rb_thread_s_abort_exc, rb_thread_s_abort_exc_set):
+	  [DOC] the raised exception will be re-raised in the main thread,
+	  and then follows the ordinary exception sequence, exit status is
+	  not 0. [Bug #12991]
+
+	* thread.c (rb_thread_abort_exc_set): ditto.
+
 Tue Dec 27 19:29:54 2016  Akinori MUSHA  <knu@i...>
 
 	* configure.in: reverse compatibility_version and current_version for
Index: ruby_2_2/thread.c
===================================================================
--- ruby_2_2/thread.c	(revision 57212)
+++ ruby_2_2/thread.c	(revision 57213)
@@ -2447,8 +2447,8 @@ rb_thread_s_main(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/thread.c#L2447
  *
  *  The default is +false+.
  *
- *  When set to +true+, all threads will abort (the process will
- *  <code>exit(0)</code>) if an exception is raised in any thread.
+ *  When set to +true+, if any thread is aborted by an exception, the
+ *  raised exception will be re-raised in the main thread.
  *
  *  Can also be specified by the global $DEBUG flag or command line option
  *  +-d+.
@@ -2470,7 +2470,8 @@ rb_thread_s_abort_exc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/thread.c#L2470
  *  call-seq:
  *     Thread.abort_on_exception= boolean   -> true or false
  *
- *  When set to +true+, all threads will abort if an exception is raised.
+ *  When set to +true+, if any thread is aborted by an exception, the
+ *  raised exception will be re-raised in the main thread.
  *  Returns the new state.
  *
  *     Thread.abort_on_exception = true
@@ -2531,10 +2532,8 @@ rb_thread_abort_exc(VALUE thread) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/thread.c#L2532
  *  call-seq:
  *     thr.abort_on_exception= boolean   -> true or false
  *
- *  When set to +true+, all threads (including the main program) will abort if
- *  an exception is raised in this +thr+.
- *
- *  The process will effectively <code>exit(0)</code>.
+ *  When set to +true+, if this +thr+ is aborted by an exception, the
+ *  raised exception will be re-raised in the main thread.
  *
  *  See also #abort_on_exception.
  *
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57212)
+++ ruby_2_2/version.h	(revision 57213)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
 #define RUBY_RELEASE_DATE "2016-12-27"
-#define RUBY_PATCHLEVEL 403
+#define RUBY_PATCHLEVEL 404
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 12

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56928


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