[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 1f4886fdb09: Do not error out on non image file (bug#61639)
From: |
Eli Zaretskii |
Subject: |
emacs-29 1f4886fdb09: Do not error out on non image file (bug#61639) |
Date: |
Wed, 22 Feb 2023 08:21:04 -0500 (EST) |
branch: emacs-29
commit 1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd
Author: Manuel Giraud <manuel@ledu-giraud.fr>
Commit: Eli Zaretskii <eliz@gnu.org>
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 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))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 1f4886fdb09: Do not error out on non image file (bug#61639),
Eli Zaretskii <=