Changeset 12554


Ignore:
Timestamp:
03/17/10 13:23:46 (11 years ago)
Author:
Mark Evenson
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.19.x/abcl/src/org/armedbear/lisp/Pathname.java

    r12553 r12554  
    10941094                host = defaults.host;
    10951095            }
    1096             directory = mergeDirectories(directory, defaults.directory);
     1096            if (directory == NIL && defaults != null) {
     1097                directory = defaults.directory;
     1098            }
    10971099            if (!deviceSupplied) {
    10981100                device = defaults.device;
Note: See TracChangeset for help on using the changeset viewer.