From e9b6f649a97800fcc045b52a63556d25ca4b472c Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Sun, 19 Feb 2023 21:03:57 +0100 Subject: [PATCH] Do not error out on non image file (bug#61639) * lisp/image/image-dired.el (image-dired-display-thumbs): Do not insert non image file and do not display image-dired buffer if it is empty. --- lisp/image/image-dired.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el index cfcd1851188..20697b3c9e0 100644 --- a/lisp/image/image-dired.el +++ b/lisp/image/image-dired.el @@ -586,13 +586,15 @@ image-dired-display-thumbs (erase-buffer)) (goto-char (point-max))) (dolist (file files) - (let ((thumb (image-dired--get-create-thumbnail-file file))) + (when (string-match-p (image-dired--file-name-regexp) file) (image-dired-insert-thumbnail - thumb file dired-buf + (image-dired--get-create-thumbnail-file file) file dired-buf (cl-incf image-dired--number-of-thumbnails))))) - (if do-not-pop - (display-buffer buf) - (pop-to-buffer buf)) + (if (> image-dired--number-of-thumbnails 0) + (if do-not-pop + (display-buffer buf) + (pop-to-buffer buf)) + (message "No images selected")) (image-dired--line-up-with-method) (image-dired--update-header-line)))) -- 2.39.1