From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 6 Sep 1996 17:10:57 +0000 (+0000)
Subject: Fix bug: error signalled in dired when trying to determine whether a
X-Git-Tag: 20090517-FFI~5395
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=59ddc7d2832a95f6ce0aac9f0a81ee61ce0b384e;p=mit-scheme.git

Fix bug: error signalled in dired when trying to determine whether a
given pathname specifies a directory.
---

diff --git a/v7/src/edwin/dired.scm b/v7/src/edwin/dired.scm
index 39a55656c..aaac40a89 100644
--- a/v7/src/edwin/dired.scm
+++ b/v7/src/edwin/dired.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: dired.scm,v 1.163 1996/04/24 02:19:57 cph Exp $
+;;;	$Id: dired.scm,v 1.164 1996/09/06 17:10:57 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-96 Massachusetts Institute of Technology
 ;;;
@@ -251,10 +251,12 @@ Type `h' after entering dired for more info."
 
 (define (read-directory pathname file-list switches mark)
   (if (eq? 'ALL file-list)
-      (insert-directory! (if (and (not (pathname-wild? pathname))
-				  (file-directory? pathname))
-			     (pathname-as-directory pathname)
-			     pathname)
+      (insert-directory! (let ((dir (pathname-as-directory pathname)))
+			   (if (and (not (pathname-wild? pathname))
+				    (not (pathname=? pathname dir))
+				    (file-directory? pathname))
+			       dir
+			       pathname))
 			 switches mark
 			 (if (pathname-wild? pathname)
 			     'WILDCARD