yugui	2009-10-25 23:46:43 +0900 (Sun, 25 Oct 2009)

  New Revision: 25481

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

  Log:
    merges r24531 from trunk into ruby_1_9_1.
    --
    * lib/delegate.rb (Delegator#method_missing): __FILE__ may contain
      multi-byte characters.  a patch from Kenta Murata in [ruby-dev:39066].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/delegate.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25480)
+++ ruby_1_9_1/ChangeLog	(revision 25481)
@@ -1,3 +1,8 @@
+Fri Aug 14 00:19:49 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/delegate.rb (Delegator#method_missing): __FILE__ may contain
+	  multi-byte characters.  a patch from Kenta Murata in [ruby-dev:39066].
+
 Thu Aug 13 21:01:03 2009  wanabe  <s.wanabe@g...>
 
 	* vm.c (vm_exec): returning from lambda runs ensure section.
Index: ruby_1_9_1/lib/delegate.rb
===================================================================
--- ruby_1_9_1/lib/delegate.rb	(revision 25480)
+++ ruby_1_9_1/lib/delegate.rb	(revision 25481)
@@ -137,7 +137,7 @@
         target.__send__(m, *args, &block)
       end
     rescue Exception
-      $@.delete_if{|s| %r"\A#{__FILE__}:\d+:in `method_missing'\z"o =~ s}
+      $@.delete_if{|s| %r"\A#{Regexp.quote(__FILE__)}:\d+:in `method_missing'\z"o =~ s}
       ::Kernel::raise
     end
   end
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25480)
+++ ruby_1_9_1/version.h	(revision 25481)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 287
+#define RUBY_PATCHLEVEL 288
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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