From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 9 Aug 2000 12:01:09 +0000 (+0000)
Subject: (insert-directory): Don't call access-file on
X-Git-Tag: emacs-pretest-21.0.90~2391
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17ab9c39809786bf12eff03cf66974d4c77c3a00;p=emacs.git

(insert-directory): Don't call access-file on
directories on DOS and Windows.
---

diff --git a/lisp/files.el b/lisp/files.el
index 1a7ddb872cf..3c78f4ba099 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3560,8 +3560,20 @@ If WILDCARD, it also runs the shell specified by `shell-file-name'."
                                   file))))))))
 	  (if (/= result 0)
 	      ;; We get here if `insert-directory-program' failed.
-	      ;; Access the file to get a suitable error.
-	      (access-file file "Reading directory")
+	      ;; On non-Posix systems, we cannot open a directory, so
+	      ;; don't even try, because that will always result in
+	      ;; the ubiquitous "Access denied".  Instead, show them
+	      ;; the `ls' command line and let them guess what went
+	      ;; wrong.
+	      (if (and (file-directory-p file)
+		       (memq system-type '(ms-dos windows-nt)))
+		  (error
+		   "Reading directory: \"%s %s -- %s\" exited with status %s"
+		   insert-directory-program
+		   (if (listp switches) (concat switches) switches)
+		   file result)
+		;; Unix.  Access the file to get a suitable error.
+		(access-file file "Reading directory"))
 	    ;; Replace "total" with "used", to avoid confusion.
 	    ;; Add in the amount of free space.
 	    (save-excursion