mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 18:41:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-29

Browse source 
bf7034048c ; * doc/emacs/custom.texi (Changing a Variable): Update e...
466d1c98a9 Fix icons.el when icon does not exist as a file
2a861124e8 ; Improve documentation of 'buffer-match-p'
dc9d02f8a0 * lisp/isearch.el (isearch-search-and-update): Let-bind '...
9308d9a74a * src/comp.c (Fcomp__compile_ctxt_to_file): Fix hash tabl...
a2a6619b28 Provide decent documentation for 'help-quick'
ab66b749a2 ; * src/window.c (Fset_window_margins): Doc fix.
1a677d1429 treesit--pre-syntax-ppss: Fix args-out-of-range in intern...
This commit is contained in:
Eli Zaretskii 2024-01-06 08:20:19 -05:00
commit 5256b8dd4e
10 changed files with 64 additions and 25 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)
(cl-defmethod icons--create ((_type (eql 'image)) icon keywords)
(let ((file (if (file-name-absolute-p icon)
icon
(and (fboundp 'image-search-load-path)
(image-search-load-path icon)))))
(and (display-images-p)
(let* ((file (if (file-name-absolute-p icon)
icon
(and (fboundp 'image-search-load-path)
(image-search-load-path icon))))
(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