diff options
| author | Richard M. Stallman | 1993-07-26 05:56:43 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-07-26 05:56:43 +0000 |
| commit | cf39fa9b4e4d4a274fdbf97f0c3a85de84cbacb9 (patch) | |
| tree | 50a102aa0473a6f40e29a7fd4b09ff259170460d /lisp/dired.el | |
| parent | a9fa0bd5a62b2a0f4405a917da759c014744b6f3 (diff) | |
| download | emacs-cf39fa9b4e4d4a274fdbf97f0c3a85de84cbacb9.tar.gz emacs-cf39fa9b4e4d4a274fdbf97f0c3a85de84cbacb9.zip | |
(dired-readin-insert): If we got a list of files,
pass nil for WILDCARD arg to dired-insert-directory.
(dired-readin-insert): Don't use the "whole directory"
case if DIR-OR-LIST is a list.
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 654433fc175..ee1d5abb272 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -489,13 +489,17 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh." | |||
| 489 | (if (consp dir-or-list) | 489 | (if (consp dir-or-list) |
| 490 | (setq dirname (car dir-or-list)) | 490 | (setq dirname (car dir-or-list)) |
| 491 | (setq dirname dir-or-list)) | 491 | (setq dirname dir-or-list)) |
| 492 | (if (equal default-directory dirname) ;; i.e., (file-directory-p dirname) | 492 | (if (and (equal default-directory dirname) |
| 493 | (not (consp dir-or-list))) | ||
| 494 | ;; If we are reading a whole single directory... | ||
| 493 | (dired-insert-directory dir-or-list dired-actual-switches nil t) | 495 | (dired-insert-directory dir-or-list dired-actual-switches nil t) |
| 494 | (if (not (file-readable-p | 496 | (if (not (file-readable-p |
| 495 | (directory-file-name (file-name-directory dirname)))) | 497 | (directory-file-name (file-name-directory dirname)))) |
| 496 | (error "Directory %s inaccessible or nonexistent" dirname) | 498 | (error "Directory %s inaccessible or nonexistent" dirname) |
| 497 | ;; else assume it contains wildcards: | 499 | ;; Else assume it contains wildcards, |
| 498 | (dired-insert-directory dir-or-list dired-actual-switches t) | 500 | ;; unless it is an explicit list of files. |
| 501 | (dired-insert-directory dir-or-list dired-actual-switches | ||
| 502 | (not (listp dir-or-list))) | ||
| 499 | (save-excursion ;; insert wildcard instead of total line: | 503 | (save-excursion ;; insert wildcard instead of total line: |
| 500 | (goto-char (point-min)) | 504 | (goto-char (point-min)) |
| 501 | (insert "wildcard " (file-name-nondirectory dirname) "\n")))))) | 505 | (insert "wildcard " (file-name-nondirectory dirname) "\n")))))) |
| @@ -506,9 +510,9 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh." | |||
| 506 | ;; list. | 510 | ;; list. |
| 507 | (if (consp dir-or-list) | 511 | (if (consp dir-or-list) |
| 508 | (progn | 512 | (progn |
| 509 | (mapcar | 513 | (mapcar |
| 510 | (function (lambda (x) (insert-directory x switches wildcard full-p))) | 514 | (function (lambda (x) (insert-directory x switches wildcard full-p))) |
| 511 | (cdr dir-or-list))) | 515 | (cdr dir-or-list))) |
| 512 | (insert-directory dir-or-list switches wildcard full-p)) | 516 | (insert-directory dir-or-list switches wildcard full-p)) |
| 513 | (setq dired-directory dir-or-list)) | 517 | (setq dired-directory dir-or-list)) |
| 514 | 518 | ||