Changeset 13288

Timestamp:

05/23/11 16:27:17 (12 years ago)

Author:

vvoutilainen

Message:

Revert the earlier attempt to fix the version copying issue,
it badly breaks quicklisp.

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (3 diffs)

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

@@ -1255 +1255 @@
         boolean typeSupplied = false;
         boolean directorySupplied = false;
-        boolean versionSupplied = false;
         for (int i = 0; i < args.length; i += 2) {
             LispObject key = args[i];
@@ -1292 +1291 @@
             } else if (key == Keyword.VERSION) {
                 version = value;
-                versionSupplied = true;
             } else if (key == Keyword.DEFAULTS) {
                 defaults = coerceToPathname(value);
@@ -1314 +1312 @@
             if (!typeSupplied) {
                 type = defaults.type;
-            }
-            if (!versionSupplied) {
-                version = defaults.version;
             }
         }