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

[Mark Evenson]

Author: mevenson
Date: Tue Mar 16 14:06:28 2010
New Revision: 12551

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


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	Tue Mar 16 14:06:28 2010
@@ -1102,7 +1102,9 @@
             if (host == NIL) {
                 host = defaults.host;
             }
-            directory = mergeDirectories(directory, defaults.directory);
+            if (directory == NIL && defaults != null) {
+                directory = defaults.directory;
+            }
             if (!deviceSupplied) {
                 device = defaults.device;
             }