bug#61639: 30.0.50; [PATCH] Do not error out on non image file in image-dired

[Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 695 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

[...]

>> 'plusp' is a classic Common Lisp predicate (that also seems to be
>> defined in Emacs).  It is equivalent to (> x 0)… maybe you prefer that.
>> Should I fix my patch?
>
> Where is it defined?  It isn't defined in "emacs -Q", and not after
> loading image-dired.  (Tested in Emacs 29.)

C-h f gives me this:
--8<---------------cut here---------------start------------->8---
plusp is an alias for ‘cl-plusp’ in ‘cl.el’.

This function is obsolete since 27.1; use ‘cl-plusp’ instead.
--8<---------------cut here---------------end--------------->8---

… anyway here is an updated version of the patch to avoid this.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Do-not-error-out-on-non-image-file-bug-61639.patch --]
[-- Type: text/x-patch, Size: 1503 bytes --]

From e9b6f649a97800fcc045b52a63556d25ca4b472c Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
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


[-- Attachment #3: Type: text/plain, Size: 18 bytes --]

-- 
Manuel Giraud