procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make `C-x 8 e e' work better in the terminal

Browse source 
* lisp/international/emoji.el (emoji--adjust-displayable-1): Make
something rudimentary work on non-graphical Emacsen for `C-x 8 e e'.
This commit is contained in:
Lars Ingebrigtsen 2021-11-07 16:59:22 +01:00
parent 3886c95d7e
commit 5012124707
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lisp/international/emoji.el
View file

@ -266,15 +266,26 @@ character) under point is."
;; the search feature.
(when-let ((name (emoji--name glyph)))
(setf (gethash (downcase name) emoji--all-bases) glyph))
;; Remove glyphs we don't have in graphical displays.
(if (let ((char (elt glyph 0)))
(if emoji--font
(font-has-char-p emoji--font char)
(when-let ((font (car (internal-char-font nil char))))
(setq emoji--font font))))
(setq alist (cdr alist))
;; Remove the element.
(setcdr alist (cddr alist)))))))
(if (display-graphic-p)
;; Remove glyphs we don't have in graphical displays.
(if (let ((char (elt glyph 0)))
(if emoji--font
(font-has-char-p emoji--font char)
(when-let ((font (car (internal-char-font nil char))))
(setq emoji--font font))))
(setq alist (cdr alist))
;; Remove the element.
(setcdr alist (cddr alist)))
;; We don't have font info on non-graphical displays.
(if (let ((char (elt glyph 0)))
;; FIXME. Some grapheme clusters display more or less
;; correctly in the terminal, but we don't really know
;; which ones. None of these display totally
;; correctly, though, so should they be filtered out?
(char-displayable-p char))
(setq alist (cdr alist))
;; Remove the element.
(setcdr alist (cddr alist))))))))
(defun emoji--parse-emoji-test ()
(setq emoji--labels nil)