[armedbear-cvs] r12554 - branches/0.19.x/abcl/src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Wed Mar 17 09:23:46 2010
New Revision: 12554

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


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

Modified: branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java	(original)
+++ branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java	Wed Mar 17 09:23:46 2010
@@ -1093,7 +1093,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;
             }