From f1666b8a3e59976e2388e39858bab3d7ec94c228 Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Wed, 18 Dec 1991 11:40:52 +0000 Subject: [PATCH] Fixed merge-pathnames to actually merge in the defaults. --- code/pathname.lisp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/pathname.lisp b/code/pathname.lisp index 238a0bbfc..c0b39a819 100644 --- a/code/pathname.lisp +++ b/code/pathname.lisp @@ -6,7 +6,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.1 1991/12/16 10:29:04 wlott Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.2 1991/12/18 11:40:52 wlott Exp $") ;;; ;;; ********************************************************************** ;;; @@ -351,8 +351,8 @@ (defaults *default-pathname-defaults*) (default-version :newest)) (with-pathname (defaults defaults) - (with-pathname (pathname (let ((*default-pathname-defaults* defaults)) - pathname)) + (let ((pathname (let ((*default-pathname-defaults* defaults)) + (pathname pathname)))) (let* ((default-host (%pathname-host defaults)) (pathname-host (%pathname-host pathname)) (diddle-case -- GitLab