From b34040302f98fabe132e2ae3b383d6e903dacdfd Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 5 Nov 2025 19:54:56 +0200 Subject: [PATCH] * lisp/image.el (image-supported-file-p): Fix autoload cookie (bug#79764). * lisp/emacs-lisp/icons.el (icons--create): * lisp/mail/rmailmm.el (rmail-mime-set-bulk-data): Remove unnecessary '(fboundp 'image-supported-file-p)'. --- lisp/emacs-lisp/icons.el | 1 - lisp/image.el | 2 +- lisp/mail/rmailmm.el | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/icons.el b/lisp/emacs-lisp/icons.el index 83bbfc10cb4..b01cc76275e 100644 --- a/lisp/emacs-lisp/icons.el +++ b/lisp/emacs-lisp/icons.el @@ -194,7 +194,6 @@ present if the icon is represented by an image." (file-exists (and (stringp file) (file-readable-p file)))) (and file-exists (display-images-p) - (fboundp 'image-supported-file-p) (image-supported-file-p file) (propertize " " 'display diff --git a/lisp/image.el b/lisp/image.el index 51a7a687961..06cd1543c08 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -417,7 +417,7 @@ be determined." ;; If nothing seems to be supported, return first type that matched. (or first (setq first type)))))))) - ;;;###autoload +;;;###autoload (defun image-supported-file-p (file) "Return non-nil if Emacs can display the specified image FILE. The returned value is a symbol specifying the image type of FILE, diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 173f95fd325..a1fb715ab5e 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -842,9 +842,8 @@ directly." ((string-match "text/" content-type) (setq type 'text)) ((string-match "image/\\(.*\\)" content-type) - (setq type (and (fboundp 'image-supported-file-p) - (image-supported-file-p - (concat "." (match-string 1 content-type))))) + (setq type (image-supported-file-p + (concat "." (match-string 1 content-type)))) (when (and type rmail-mime-show-images (not (eq rmail-mime-show-images 'button))