diff options
| author | Manuel Giraud <manuel@ledu-giraud.fr> | 2023-02-19 21:03:57 +0100 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-02-22 15:20:45 +0200 |
| commit | 1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd (patch) | |
| tree | af90b242419cfdd0fde14a3f3bdde30b98f6adc7 /lisp/image | |
| parent | 003759a6dca730df6fae6c9bc8d4a47761b10014 (diff) | |
| download | emacs-1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd.tar.gz emacs-1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd.tar.bz2 emacs-1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd.zip | |
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.
Diffstat (limited to 'lisp/image')
| -rw-r--r-- | lisp/image/image-dired.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el index 11632e7f28e..8e2a75a418f 100644 --- a/lisp/image/image-dired.el +++ b/lisp/image/image-dired.el @@ -585,13 +585,15 @@ thumbnail buffer to be selected." (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)))) |