summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--version.h2
-rw-r--r--vm_eval.c8
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e6c546a01e..16b8250d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,
diff --git a/version.h b/version.h
index 96dd8ff8ca..244f7c9337 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/vm_eval.c b/vm_eval.c
index b765ad6692..9c9f5fe705 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -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