shyouhei	2010-06-16 16:01:05 +0900 (Wed, 16 Jun 2010)

  New Revision: 28337

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28337

  Log:
    merge revision(s) 23485:
    * lib/pathname.rb (Pathname#sub): suppress a warning.
      [ruby-dev:38488]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/pathname.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28336)
+++ ruby_1_8_7/ChangeLog	(revision 28337)
@@ -1,3 +1,8 @@
+Wed Jun 16 16:01:42 2010  Tanaka Akira  <akr@f...>
+
+	* lib/pathname.rb (Pathname#sub): suppress a warning.
+	  [ruby-dev:38488]
+
 Wed Jun 16 15:21:12 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/webrick/utils.rb (TestWEBrick#start_server): add log for
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28336)
+++ ruby_1_8_7/version.h	(revision 28337)
@@ -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
Index: ruby_1_8_7/lib/pathname.rb
===================================================================
--- ruby_1_8_7/lib/pathname.rb	(revision 28336)
+++ ruby_1_8_7/lib/pathname.rb	(revision 28337)
@@ -260,7 +260,7 @@
         ensure
           Thread.current[:pathname_sub_matchdata] = old
         end
-        yield *args
+        yield(*args)
       }
     else
       path = @path.sub(pattern, *rest)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/