summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 01:02:59 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 01:02:59 +0000
commite008721b05660b9e306a28dbe13ce5237b7fcf45 (patch)
treed237078b0f5a4f1c5dd0693068e60b648fca324d
parent622f19cdefb496b0e483edae7ab86b9ad5144a0d (diff)
merges r20629 from trunk into ruby_1_9_1.
* lib/pathname.rb (Pathname#=~): undefed. at asakusa.rb. [ruby-core:19690] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/pathname.rb4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3aa248afd3..440fe72235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 11 19:16:30 2008 Tanaka Akira <akr@fsij.org>
+
+ * lib/pathname.rb (Pathname#=~): undefed. at asakusa.rb.
+ [ruby-core:19690]
+
Thu Dec 11 13:09:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (reg_enc_error): raise EncodingCompatibilityError for
diff --git a/lib/pathname.rb b/lib/pathname.rb
index 1bc0063bb0..86f0f54800 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -1063,6 +1063,10 @@ class Pathname # * mixed *
end
end
+class Pathname
+ undef =~
+end
+
module Kernel
# create a pathname object.
#