masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 11:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix icons.el when icon does not exist as a file

Browse source 
* lisp/emacs-lisp/icons.el (icons--create): Handle the case when
ICON is a file that doesn't exists or is unreadable.  Suggested by
David Ponce <da_vid@orange.fr>.  (Bug#66846)
This commit is contained in:
Eli Zaretskii 2024-01-06 13:26:29 +02:00
parent 2a861124e8
commit 466d1c98a9
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/emacs-lisp/icons.el
View file

@ -187,11 +187,13 @@ present if the icon is represented by an image."
merged) merged)
(cl-defmethod icons--create ((_type (eql 'image)) icon keywords) (cl-defmethod icons--create ((_type (eql 'image)) icon keywords)
(let ((file (if (file-name-absolute-p icon) (let* ((file (if (file-name-absolute-p icon)
icon icon
(and (fboundp 'image-search-load-path) (and (fboundp 'image-search-load-path)
(image-search-load-path icon))))) (image-search-load-path icon))))
(and (display-images-p) (file-exists (and (stringp file) (file-readable-p file))))
(and file-exists
(display-images-p)
(fboundp 'image-supported-file-p) (fboundp 'image-supported-file-p)
(image-supported-file-p file) (image-supported-file-p file)
(propertize (propertize