[armedbear-cvs] r12653 - trunk/abcl/src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Wed May  5 01:32:52 2010
New Revision: 12653

Log:
Fix MERGE-PATHNAMES for URL-PATHNAME under Windows.

If the Pathname is a URL-PATHNAME, do not include the defaulted
DEVICE.



Modified:
   trunk/abcl/src/org/armedbear/lisp/Pathname.java

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Wed May  5 01:32:52 2010
@@ -1795,7 +1795,9 @@
         if (pathname.device != NIL) { // XXX if device represent JARs we want to merge
             result.device = p.device;
         } else {
-            result.device = d.device;
+            if (!p.isURL()) {
+                result.device = d.device;
+            }
         }
 
         if (pathname.isJar()) {