aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-08-01 04:43:38 +0000
committerRichard M. Stallman1994-08-01 04:43:38 +0000
commitf150bd2b3e0d5d2540ae45b5bfd3d09735a2ea8f (patch)
treed12ebf124ec81fc104c8a8868714037e2832b393
parent05d9e5954d57bff0b8f659158bba77cd601bf28c (diff)
downloademacs-f150bd2b3e0d5d2540ae45b5bfd3d09735a2ea8f.tar.gz
emacs-f150bd2b3e0d5d2540ae45b5bfd3d09735a2ea8f.zip
(dired-insert-directory): Call expand-file-name here
because the dir name may have been abbreviated before.
-rw-r--r--lisp/dired.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index 705c1b8abb7..12925074258 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -526,13 +526,16 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh."
526 ;; Do the right thing whether dir-or-list is atomic or not. If it is, 526 ;; Do the right thing whether dir-or-list is atomic or not. If it is,
527 ;; inset all files listed in the cdr (the car is the passed-in directory 527 ;; inset all files listed in the cdr (the car is the passed-in directory
528 ;; list). 528 ;; list).
529 ;; We expand the file names here because the may have been abbreviated
530 ;; in dired-noselect.
529 (let ((opoint (point))) 531 (let ((opoint (point)))
530 (if (consp dir-or-list) 532 (if (consp dir-or-list)
531 (progn 533 (progn
532 (mapcar 534 (mapcar
533 (function (lambda (x) (insert-directory x switches wildcard full-p))) 535 (function (lambda (x) (insert-directory (expand-file-name x)
536 switches wildcard full-p)))
534 (cdr dir-or-list))) 537 (cdr dir-or-list)))
535 (insert-directory dir-or-list switches wildcard full-p)) 538 (insert-directory (expand-file-name dir-or-list) switches wildcard full-p))
536 (dired-insert-set-properties opoint (point))) 539 (dired-insert-set-properties opoint (point)))
537 (setq dired-directory dir-or-list)) 540 (setq dired-directory dir-or-list))
538 541