Changeset 12653

Timestamp:

05/05/10 05:32:52 (13 years ago)

Author:

Mark Evenson

Message:

Fix MERGE-PATHNAMES for URL-PATHNAME under Windows.

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

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (1 diff)

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

@@ -1796 +1796 @@
             result.device = p.device;
         } else {
-            result.device = d.device;
+            if (!p.isURL()) {
+                result.device = d.device;
+            }
         }