From df09bfac943e649db5780e17388275fb3f9934e6 Mon Sep 17 00:00:00 2001
From: wlott <wlott>
Date: Sat, 17 Nov 1990 05:40:13 +0000
Subject: [PATCH] In ambiguous-files, don't merge in the name and type from
 defaults, and check for subdirs, so that we get the trailing slash on them.

---
 code/filesys.lisp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/filesys.lisp b/code/filesys.lisp
index 223a4c763..8ac4dcf4c 100644
--- a/code/filesys.lisp
+++ b/code/filesys.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.5 1990/11/09 23:37:20 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.6 1990/11/17 05:40:13 wlott Exp $
 ;;;
 ;;; Ugly pathname functions for Spice Lisp.
 ;;;    these functions are part of the standard Spice Lisp environment.
@@ -998,9 +998,12 @@
   We look in the directory specified by Defaults as well as looking down
   the search list."
   (directory (concatenate 'string
-			  (namestring (merge-pathnames pathname defaults))
-			  "*")
-	     :check-for-subdirs nil))
+			  (namestring
+			   (merge-pathnames pathname
+					    (make-pathname :defaults defaults
+							   :name nil
+							   :type nil)))
+			  "*")))
 
 
 ;;; File-writable -- exported from extensions.
-- 
GitLab