nagachika	2016-03-29 02:04:28 +0900 (Tue, 29 Mar 2016)

  New Revision: 54339

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

  Log:
    merge revision(s) 54089: [Backport #12170]
    
    * vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
      cannot enclose non-identifier characters.
      a patch by Sebastian S in [ruby-core:74278].  [Bug#12170]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_eval.c
Index: ruby_2_2/vm_eval.c
===================================================================
--- ruby_2_2/vm_eval.c	(revision 54338)
+++ ruby_2_2/vm_eval.c	(revision 54339)
@@ -1905,10 +1905,10 @@ catch_i(VALUE tag, VALUE data) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_eval.c#L1905
  *
  *     catch(1) { 123 }            # => 123
  *
- *  If +throw(tag2, val)+ is called, Ruby searches up its stack for a +catch+
- *  block whose +tag+ has the same +object_id+ as _tag2_. When found, the block
- *  stops executing and returns _val_ (or +nil+ if no second argument was given
- *  to +throw+).
+ *  If <code>throw(tag2, val)</code> is called, Ruby searches up its stack for
+ *  a +catch+ block whose +tag+ has the same +object_id+ as _tag2_. When found,
+ *  the block stops executing and returns _val_ (or +nil+ if no second argument
+ *  was given to +throw+).
  *
  *     catch(1) { throw(1, 456) }  # => 456
  *     catch(1) { throw(1) }       # => nil
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54338)
+++ ruby_2_2/version.h	(revision 54339)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 281
+#define RUBY_PATCHLEVEL 282
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54338)
+++ ruby_2_2/ChangeLog	(revision 54339)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 02:04:18 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
+	  cannot enclose non-identifier characters.
+	  a patch by Sebastian S in [ruby-core:74278].  [Bug#12170]
+
 Tue Mar 29 02:02:53 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/-ext-/float/test_nextafter.rb: In AIX,

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


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