diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-10-27 21:04:10 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-10-27 21:05:16 +0200 |
| commit | 75ebbc6a27e28227ab4a6b9f5ba114056478f885 (patch) | |
| tree | 9e7eed6aaad274fbb55ad7d752252bb15ece1288 /lisp/image-dired.el | |
| parent | c70fdcdd114659d5358256938013c22a70b18f07 (diff) | |
| download | emacs-75ebbc6a27e28227ab4a6b9f5ba114056478f885.tar.gz | |
image-dired: Don't show thumbnails if there are no image files
* lisp/image-dired.el (image-dired-show-all-from-dir): Don't show
thumbnail buffer if there are no image files.
Diffstat (limited to 'lisp/image-dired.el')
| -rw-r--r-- | lisp/image-dired.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 1239821b019..250a76ba126 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1140,18 +1140,19 @@ never ask for confirmation." (interactive "DImage Dired: ") (dired dir) (dired-mark-files-regexp (image-file-name-regexp)) - (let ((files (dired-get-marked-files))) - (if (or (not image-dired-show-all-from-dir-max-files) - (<= (length files) image-dired-show-all-from-dir-max-files) - (and (> (length files) image-dired-show-all-from-dir-max-files) - (y-or-n-p - (format - "Directory contains more than %d image files. Proceed? " - image-dired-show-all-from-dir-max-files)))) - (progn - (image-dired-display-thumbs) - (pop-to-buffer image-dired-thumbnail-buffer)) - (message "Canceled.")))) + (let ((files (dired-get-marked-files nil nil nil t))) + (cond ((and (null (cdr files))) + (message "No image files in directory")) + ((or (not image-dired-show-all-from-dir-max-files) + (<= (length (cdr files)) image-dired-show-all-from-dir-max-files) + (and (> (length (cdr files)) image-dired-show-all-from-dir-max-files) + (y-or-n-p + (format + "Directory contains more than %d image files. Proceed?" + image-dired-show-all-from-dir-max-files)))) + (image-dired-display-thumbs) + (pop-to-buffer image-dired-thumbnail-buffer)) + (t (message "Image-Dired canceled"))))) ;;;###autoload (defalias 'image-dired 'image-dired-show-all-from-dir) |