shyouhei	2010-11-23 17:21:08 +0900 (Tue, 23 Nov 2010)

  New Revision: 29884

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

  Log:
    merge revision(s) 29333:
     
     	* lib/pathname.rb (relative_path_from): backport r23093 and r25440
     	  from ruby_1_9_2.  [ruby-core:32415]
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  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 29883)
+++ ruby_1_8_7/ChangeLog	(revision 29884)
@@ -1,3 +1,8 @@
+Tue Nov 23 17:09:14 2010  NAKAMURA Usaku  <usa@r...>
+
+	* lib/pathname.rb (relative_path_from): backport r23093 and r25440
+	  from ruby_1_9_2.  [ruby-core:32415]
+
 Mon Nov 22 14:13:45 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c: fix checking version of GCC.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29883)
+++ ruby_1_8_7/version.h	(revision 29884)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-11-22"
+#define RUBY_RELEASE_DATE "2010-11-23"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 317
+#define RUBY_RELEASE_CODE 20101123
+#define RUBY_PATCHLEVEL 318
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/lib/pathname.rb
===================================================================
--- ruby_1_8_7/lib/pathname.rb	(revision 29883)
+++ ruby_1_8_7/lib/pathname.rb	(revision 29884)
@@ -194,6 +194,13 @@
     # to_path is implemented so Pathname objects are usable with File.open, etc.
     TO_PATH = :to_path
   end
+
+  SAME_PATHS = if File::FNM_SYSCASE.nonzero?
+    proc {|a, b| a.casecmp(b).zero?}
+  else
+    proc {|a, b| a == b}
+  end
+
   # :startdoc:
 
   #
@@ -719,12 +726,12 @@
       base_prefix, basename = r
       base_names.unshift basename if basename != '.'
     end
-    if dest_prefix != base_prefix
+    unless SAME_PATHS[dest_prefix, base_prefix]
       raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
     end
     while !dest_names.empty? &&
           !base_names.empty? &&
-          dest_names.first == base_names.first
+          SAME_PATHS[dest_names.first, base_names.first]
       dest_names.shift
       base_names.shift
     end

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