Mercurial > emacs
changeset 10390:a653accbfcbb
(dired-insert-directory): Don't call expand-file-name
when dir-or-list is a list.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Wed, 11 Jan 1995 01:28:22 +0000 |
parents | 162b3e6c4610 |
children | 55428c377c84 |
files | lisp/dired.el |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/dired.el Wed Jan 11 01:19:09 1995 +0000 +++ b/lisp/dired.el Wed Jan 11 01:28:22 1995 +0000 @@ -538,16 +538,16 @@ ;; 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))