From 0d5b4489061dcb88b8c6bf6fea59e7fe63df68ca Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 24 Nov 2010 09:38:02 +0000 Subject: merges r29332 from trunk into ruby_1_9_2. -- * string.c (rb_str_to_i): fix rdoc: String#to_i raises an exception when base is invalid. [ruby-core:31685] Fri Sep 24 15:28:35 2010 NARUSE, Yui git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c450d56f7..1fb131624d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 24 15:50:43 2010 NARUSE, Yui + + * string.c (rb_str_to_i): fix rdoc: String#to_i raises an + exception when base is invalid. [ruby-core:31685] + Wed Sep 22 16:59:40 2010 Yuki Sonoda (Yugui) * test/test_prime.rb (TestPrime#test_new): the warning expected have diff --git a/string.c b/string.c index c85d249760..c38983561b 100644 --- a/string.c +++ b/string.c @@ -4015,7 +4015,7 @@ rb_str_include(VALUE str, VALUE arg) * integer base base (between 2 and 36). Extraneous characters past the * end of a valid number are ignored. If there is not a valid number at the * start of str, 0 is returned. This method never raises an - * exception. + * exception when base is valid. * * "12345".to_i #=> 12345 * "99 red balloons".to_i #=> 99 diff --git a/version.h b/version.h index 2539246dc9..2984134dc2 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 52 +#define RUBY_PATCHLEVEL 53 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3