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].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d38c6cc33..a8f2923599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 14 00:19:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* 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@gmail.com>
 
 	* vm.c (vm_exec): returning from lambda runs ensure section.
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 025e901a89..cb16adbae9 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -137,7 +137,7 @@ class Delegator
         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
diff --git a/version.h b/version.h
index 6949bb5420..fcce8b234a 100644
--- a/version.h
+++ b/version.h
@@ -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