From c9915e5b08bbb58618b2bbc2dcbc9dafd5c1ba84 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 16 Jun 2010 07:01:05 +0000 Subject: merge revision(s) 23485: * lib/pathname.rb (Pathname#sub): suppress a warning. [ruby-dev:38488] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/pathname.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4eaadb1b33..2ee35d45b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 16 16:01:42 2010 Tanaka Akira + + * lib/pathname.rb (Pathname#sub): suppress a warning. + [ruby-dev:38488] + Wed Jun 16 15:21:12 2010 Nobuyoshi Nakada * test/webrick/utils.rb (TestWEBrick#start_server): add log for diff --git a/lib/pathname.rb b/lib/pathname.rb index 86c4b98ee7..84196355a6 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -260,7 +260,7 @@ class Pathname ensure Thread.current[:pathname_sub_matchdata] = old end - yield *args + yield(*args) } else path = @path.sub(pattern, *rest) diff --git a/version.h b/version.h index 72f53f9d3c..e85620a14f 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-06-16" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100616 -#define RUBY_PATCHLEVEL 295 +#define RUBY_PATCHLEVEL 296 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3