diff options
| author | Richard M. Stallman | 1995-01-11 01:28:22 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-01-11 01:28:22 +0000 |
| commit | bc9c99bce3dee65321873d4daf390461b2081487 (patch) | |
| tree | 00e4ff7da1fdc269eb843132725f69d4258fbe46 /lisp | |
| parent | 155ffe9c93bb796e6ce7688de3fbf366a4bf4159 (diff) | |
| download | emacs-bc9c99bce3dee65321873d4daf390461b2081487.tar.gz emacs-bc9c99bce3dee65321873d4daf390461b2081487.zip | |
(dired-insert-directory): Don't call expand-file-name
when dir-or-list is a list.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/dired.el | 14 |
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." | |||
| 538 | ;; Do the right thing whether dir-or-list is atomic or not. If it is, | 538 | ;; Do the right thing whether dir-or-list is atomic or not. If it is, |
| 539 | ;; inset all files listed in the cdr (the car is the passed-in directory | 539 | ;; inset all files listed in the cdr (the car is the passed-in directory |
| 540 | ;; list). | 540 | ;; list). |
| 541 | ;; We expand the file names here because the may have been abbreviated | ||
| 542 | ;; in dired-noselect. | ||
| 543 | (let ((opoint (point)) | 541 | (let ((opoint (point)) |
| 544 | end) | 542 | end) |
| 545 | (if (consp dir-or-list) | 543 | (if (consp dir-or-list) |
| 546 | (progn | 544 | ;; In this case, use the file names in the cdr |
| 547 | (mapcar | 545 | ;; exactly as originally given to dired-noselect. |
| 548 | (function (lambda (x) (insert-directory (expand-file-name x) | 546 | (mapcar |
| 549 | switches wildcard full-p))) | 547 | (function (lambda (x) (insert-directory x switches wildcard full-p))) |
| 550 | (cdr dir-or-list))) | 548 | (cdr dir-or-list)) |
| 549 | ;; Expand the file name here because it may have been abbreviated | ||
| 550 | ;; in dired-noselect. | ||
| 551 | (insert-directory (expand-file-name dir-or-list) switches wildcard full-p)) | 551 | (insert-directory (expand-file-name dir-or-list) switches wildcard full-p)) |
| 552 | ;; Quote certain characters, unless ls quoted them for us. | 552 | ;; Quote certain characters, unless ls quoted them for us. |
| 553 | (cond ((not (string-match "b" dired-actual-switches)) | 553 | (cond ((not (string-match "b" dired-actual-switches)) |