diff options
author | Eli Zaretskii <eliz@gnu.org> | 2022-07-28 17:21:30 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2022-07-28 17:21:30 +0300 |
commit | 41b63f7bed2eb9b186a3866e3a5c90d4846b8fce (patch) | |
tree | 4c6126ff443658c1d26e733c0189b56525c8337d /lisp/emacs-lisp | |
parent | 6b96c630f7ae76bc0bd200097f7d9bf9e856f2db (diff) | |
download | emacs-41b63f7bed2eb9b186a3866e3a5c90d4846b8fce.tar.gz emacs-41b63f7bed2eb9b186a3866e3a5c90d4846b8fce.tar.bz2 emacs-41b63f7bed2eb9b186a3866e3a5c90d4846b8fce.zip |
; Minor fixes to the "icons" feature
* lisp/emacs-lisp/icons.el (icons--create): Use 'display-images-p'
to test for image capability.
* doc/lispref/display.texi (Icons): Improve indexing,
cross-references, and wording.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/icons.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/icons.el b/lisp/emacs-lisp/icons.el index da7f68f5231..74ce0476a27 100644 --- a/lisp/emacs-lisp/icons.el +++ b/lisp/emacs-lisp/icons.el @@ -192,7 +192,7 @@ present if the icon is represented by an image." (let ((file (if (file-name-absolute-p icon) icon (image-search-load-path icon)))) - (and (display-graphic-p) + (and (display-images-p) (image-supported-file-p file) (propertize " " 'display @@ -207,6 +207,8 @@ present if the icon is represented by an image." (cl-defmethod icons--create ((_type (eql 'emoji)) icon _keywords) (when-let ((font (and (display-multi-font-p) + ;; FIXME: This is not enough for ensuring + ;; display of color Emoji. (car (internal-char-font nil ?😀))))) (and (font-has-char-p font (aref icon 0)) icon))) |