diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 08:04:49 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 08:04:49 +0000 |
commit | 5d699f8a3a7ff32ebc36b7a92ececafeb81d9bab (patch) | |
tree | 017ea137890831a64876b7230a10874122d3c483 | |
parent | c03f28c98c95673d426b535dba6b5819fb5df239 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm_eval.c | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Mar 29 17:04:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 17:03:28 2016 Rei Odaira <Rei.Odaira@gmail.com> * test/-ext-/float/test_nextafter.rb: In AIX, @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 42 +#define RUBY_PATCHLEVEL 43 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 @@ -1923,10 +1923,10 @@ catch_i(VALUE tag, VALUE data) * * 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 |