From cf39fa9b4e4d4a274fdbf97f0c3a85de84cbacb9 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 26 Jul 1993 05:56:43 +0000 Subject: [PATCH] (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. --- lisp/dired.el | 16 ++++++++++------ 1 file 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." (if (consp dir-or-list) (setq dirname (car dir-or-list)) (setq dirname dir-or-list)) - (if (equal default-directory dirname) ;; i.e., (file-directory-p dirname) + (if (and (equal default-directory dirname) + (not (consp dir-or-list))) + ;; If we are reading a whole single directory... (dired-insert-directory dir-or-list dired-actual-switches nil t) (if (not (file-readable-p (directory-file-name (file-name-directory dirname)))) (error "Directory %s inaccessible or nonexistent" dirname) - ;; else assume it contains wildcards: - (dired-insert-directory dir-or-list dired-actual-switches t) + ;; Else assume it contains wildcards, + ;; unless it is an explicit list of files. + (dired-insert-directory dir-or-list dired-actual-switches + (not (listp dir-or-list))) (save-excursion ;; insert wildcard instead of total line: (goto-char (point-min)) (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." ;; list. (if (consp dir-or-list) (progn - (mapcar - (function (lambda (x) (insert-directory x switches wildcard full-p))) - (cdr dir-or-list))) + (mapcar + (function (lambda (x) (insert-directory x switches wildcard full-p))) + (cdr dir-or-list))) (insert-directory dir-or-list switches wildcard full-p)) (setq dired-directory dir-or-list)) -- 2.39.5