From 4151b2f212539d81276374d0930d76626bbe0df9 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 09:14:52 +0000 Subject: merges r23673 from trunk into ruby_1_9_1. -- * vm_eval.c (rb_f_throw): fixed rdoc about execption. [ruby-core:23824] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- vm_eval.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d633b954..8f6097d51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 13 06:45:46 2009 Nobuyoshi Nakada + + * vm_eval.c (rb_f_throw): fixed rdoc about execption. + [ruby-core:23824] + Fri Jun 12 14:56:50 2009 Nobuyoshi Nakada * file.c (file_expand_path): associate the input encoding when diff --git a/version.h b/version.h index f30cf0515..a1ec7ff19 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 174 +#define RUBY_PATCHLEVEL 175 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/vm_eval.c b/vm_eval.c index 0ec847882..cbcc55f41 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1141,7 +1141,7 @@ NORETURN(static VALUE rb_f_throw _((int, VALUE *))); * throw(symbol [, obj]) * * Transfers control to the end of the active +catch+ block - * waiting for _symbol_. Raises +NameError+ if there + * waiting for _symbol_. Raises +ArgumentError+ if there * is no +catch+ block for the symbol. The optional second * parameter supplies a return value for the +catch+ block, * which otherwise defaults to +nil+. For examples, see -- cgit