comparison lisp/dired.el @ 8407:fed86303cb07

(dired-insert-directory): Call expand-file-name here because the dir name may have been abbreviated before.
author Richard M. Stallman <rms@gnu.org>
date Mon, 01 Aug 1994 04:43:38 +0000
parents 941432da0ff3
children 579232f9f99d
comparison
equal deleted inserted replaced
8406:849045d64643 8407:fed86303cb07
524 524
525 (defun dired-insert-directory (dir-or-list switches &optional wildcard full-p) 525 (defun dired-insert-directory (dir-or-list switches &optional wildcard full-p)
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
539 (defun dired-insert-set-properties (beg end) 542 (defun dired-insert-set-properties (beg end)
540 (save-excursion 543 (save-excursion