aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-07-09 20:42:04 +0300
committerEli Zaretskii2020-07-09 20:42:04 +0300
commit2d7c3e49b0a237dd05fd35d765676ec1d4dd0730 (patch)
tree7821a1e2ee395b118eb2412ececef896a6d60097
parent59f563680daa3e25db7c85c07bee020ac48b5fa5 (diff)
downloademacs-2d7c3e49b0a237dd05fd35d765676ec1d4dd0730.tar.gz
emacs-2d7c3e49b0a237dd05fd35d765676ec1d4dd0730.zip
Improve display of compositions by "C-u C-x ="
* lisp/descr-text.el (describe-char): On TTY frames, display the Unicode names of the composed characters as well. (Bug#42256)
-rw-r--r--lisp/descr-text.el9
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 776ce7618d5..22c162a05ac 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -763,6 +763,8 @@ The character information includes:
763 (to (nth 4 composition)) 763 (to (nth 4 composition))
764 glyph) 764 glyph)
765 (if (fontp font) 765 (if (fontp font)
766 ;; GUI frame: show composition in terms of font
767 ;; glyphs.
766 (progn 768 (progn
767 (insert " using this font:\n " 769 (insert " using this font:\n "
768 (symbol-name (font-get font :type)) 770 (symbol-name (font-get font :type))
@@ -773,11 +775,14 @@ The character information includes:
773 (setq glyph (lgstring-glyph gstring from))) 775 (setq glyph (lgstring-glyph gstring from)))
774 (insert (format " %S\n" glyph)) 776 (insert (format " %S\n" glyph))
775 (setq from (1+ from)))) 777 (setq from (1+ from))))
778 ;; TTY frame: show composition in terms of characters.
776 (insert " by these characters:\n") 779 (insert " by these characters:\n")
777 (while (and (<= from to) 780 (while (and (<= from to)
778 (setq glyph (lgstring-glyph gstring from))) 781 (setq glyph (lgstring-glyph gstring from)))
779 (insert (format " %c (#x%x)\n" 782 (insert (format " %c (#x%x) %s\n"
780 (lglyph-char glyph) (lglyph-char glyph))) 783 (lglyph-char glyph) (lglyph-char glyph)
784 (get-char-code-property
785 (lglyph-char glyph) 'name)))
781 (setq from (1+ from))))) 786 (setq from (1+ from)))))
782 (insert " by the rule:\n\t(") 787 (insert " by the rule:\n\t(")
783 (let ((first t)) 788 (let ((first t))