summaryrefslogtreecommitdiff
path: root/lisp/descr-text.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2008-01-09 01:31:20 +0000
committerKenichi Handa <handa@m17n.org>2008-01-09 01:31:20 +0000
commite463f0710b3dc1fa4b6196ed59c1262719469931 (patch)
tree262c1e9b22334c0ab2bc1ea4ef2855319bad4cc4 /lisp/descr-text.el
parent430d2ee2919b2d4693780f2474ba40148442d206 (diff)
downloademacs-e463f0710b3dc1fa4b6196ed59c1262719469931.tar.gz
(describe-char-display): Convert a GLYPH-CODE to a
hexadigit string. (describe-char): Adjusted for the above change.
Diffstat (limited to 'lisp/descr-text.el')
-rw-r--r--lisp/descr-text.el19
1 files changed, 13 insertions, 6 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 633376842c6..47d17664e67 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -330,11 +330,18 @@ This function is semi-obsolete. Use `get-char-code-property'."
;; Return information about how CHAR is displayed at the buffer
;; position POS. If the selected frame is on a graphic display,
-;; return a cons (FONTNAME . GLYPH-CODE). Otherwise, return a string
-;; describing the terminal codes for the character.
+;; return a cons (FONTNAME . GLYPH-CODE) where GLYPH-CODE is a
+;; hexadigit string representing the glyph-ID. Otherwise, return a
+;; string describing the terminal codes for the character.
(defun describe-char-display (pos char)
(if (display-graphic-p (selected-frame))
- (internal-char-font pos char)
+ (let ((char-font-info (internal-char-font pos char)))
+ (if (integerp (cdr char-font-info))
+ (setcdr char-font-info (format "%02X" (cdr char-font-info)))
+ (setcdr char-font-info
+ (format "%04X%04X"
+ (cadr char-font-info) (cddr char-font-info))))
+ char-font-info)
(let* ((coding (terminal-coding-system))
(encoded (encode-coding-char char coding)))
(if encoded
@@ -482,7 +489,7 @@ as well as widgets, buttons, overlays, and text properties."
(if display
(concat
"by this font (glyph code)\n"
- (format " %s (#x%02X)"
+ (format " %s (#x%s)"
(car display) (cdr display)))
"no font available")
(if display
@@ -554,7 +561,7 @@ as well as widgets, buttons, overlays, and text properties."
(insert (glyph-char (car (aref disp-vector i))) ?:
(propertize " " 'display '(space :align-to 5))
(if (cdr (aref disp-vector i))
- (format "%s (#x%02X)" (cadr (aref disp-vector i))
+ (format "%s (#x%s)" (cadr (aref disp-vector i))
(cddr (aref disp-vector i)))
"-- no font --")
"\n")
@@ -610,7 +617,7 @@ as well as widgets, buttons, overlays, and text properties."
(insert "\n " (car elt) ?:
(propertize " " 'display '(space :align-to 5))
(if (cdr elt)
- (format "%s (#x%02X)" (cadr elt) (cddr elt))
+ (format "%s (#x%s)" (cadr elt) (cddr elt))
"-- no font --")))))
(insert "these terminal codes:")
(dolist (elt component-chars)