archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r24531 from trunk into ruby_1_9_1.

Browse source 
--
* 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
This commit is contained in:
yugui 2009-10-25 14:46:43 +00:00
parent 5a1fa79086
commit 547ef3bcd7
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Thu Aug 13 21:01:03 2009 wanabe <s.wanabe@gmail.com>
* vm.c (vm_exec): returning from lambda runs ensure section. * vm.c (vm_exec): returning from lambda runs ensure section.

2
lib/delegate.rb
View file

@ -137,7 +137,7 @@ class Delegator
target.__send__(m, *args, &block) target.__send__(m, *args, &block)
end end
rescue Exception 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 ::Kernel::raise
end end
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 287 #define RUBY_PATCHLEVEL 288
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1