From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 11 Jan 1995 01:28:22 +0000 (+0000)
Subject: (dired-insert-directory): Don't call expand-file-name
X-Git-Tag: emacs-19.34~5468
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc9c99bce3dee65321873d4daf390461b2081487;p=emacs.git

(dired-insert-directory): Don't call expand-file-name
when dir-or-list is a list.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index 53afbe8c191..6f95c9c931b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -538,16 +538,16 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh."
   ;; Do the right thing whether dir-or-list is atomic or not.  If it is,
   ;; inset all files listed in the cdr (the car is the passed-in directory
   ;; list).
-  ;; We expand the file names here because the may have been abbreviated
-  ;; in dired-noselect.
   (let ((opoint (point))
 	end)
     (if (consp dir-or-list)
-	(progn
-	  (mapcar
-	   (function (lambda (x) (insert-directory (expand-file-name x)
-						   switches wildcard full-p)))
-	   (cdr dir-or-list)))
+	;; In this case, use the file names in the cdr
+	;; exactly as originally given to dired-noselect.
+	(mapcar
+	 (function (lambda (x) (insert-directory x switches wildcard full-p)))
+	 (cdr dir-or-list))
+      ;; Expand the file name here because it may have been abbreviated
+      ;; in dired-noselect.
       (insert-directory (expand-file-name dir-or-list) switches wildcard full-p))
     ;; Quote certain characters, unless ls quoted them for us.
     (cond ((not (string-match "b" dired-actual-switches))