(list-directory): Set default-directory better if the

argument is a directory's file name.

1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 197a5624900..0afa0fe170a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2536,7 +2536,10 @@ and `list-directory-verbose-switches'."
       (terpri)
       (save-excursion
         (set-buffer "*Directory*")
-        (setq default-directory (file-name-directory dirname))
+        (setq default-directory
+              (if (file-directory-p dirname)
+                  (file-name-as-directory dirname)
+                (file-name-directory dirname)))
         (let ((wildcard (not (file-directory-p dirname))))
           (insert-directory dirname switches wildcard (not wildcard)))))))