Changeset 12554

Timestamp:

03/17/10 13:23:46 (14 years ago)

Author:

Mark Evenson

Message:

Backport r12551: MAKE-PATHNAME does not have any merging directories semantics.

File:

• branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java (modified) (1 diff)

branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java

@@ -1094 +1094 @@
                 host = defaults.host;
             }
-            directory = mergeDirectories(directory, defaults.directory);
+            if (directory == NIL && defaults != null) {
+                directory = defaults.directory;
+            }
             if (!deviceSupplied) {
                 device = defaults.device;