mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 01:34:21 +00:00
* 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)'.
This commit is contained in:
parent
9e905357bb
commit
b34040302f
3 changed files with 3 additions and 5 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in a new issue