mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
(dired-insert-directory): Don't call expand-file-name
when dir-or-list is a list.
This commit is contained in:
parent
155ffe9c93
commit
bc9c99bce3
1 changed files with 7 additions and 7 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue