summaryrefslogtreecommitdiff
path: root/lisp/dired.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-01-11 01:28:22 +0000
committerRichard M. Stallman <rms@gnu.org>1995-01-11 01:28:22 +0000
commitf248c1b337dffd3825d6e5db4623ef131beaf88c (patch)
tree7fe24ed23da4a8accac3405a22cc5c3f63cee20f /lisp/dired.el
parente2fb164e0690171fa8fc8363059b65a2491d2d88 (diff)
downloademacs-f248c1b337dffd3825d6e5db4623ef131beaf88c.tar.gz
(dired-insert-directory): Don't call expand-file-name
when dir-or-list is a list.
Diffstat (limited to 'lisp/dired.el')
-rw-r--r--lisp/dired.el14
1 files changed, 7 insertions, 7 deletions
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))