aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2007-05-28 11:59:10 +0000
committerKenichi Handa2007-05-28 11:59:10 +0000
commit29f035645ed9a7d856ac57f286e28b4dc7c08455 (patch)
tree8e3c269ee2784bc6c2e333ea9aaa78d68818babb
parentbd49b21e87f875a33a7aa32455b660d1406bb8fe (diff)
downloademacs-29f035645ed9a7d856ac57f286e28b4dc7c08455.tar.gz
emacs-29f035645ed9a7d856ac57f286e28b4dc7c08455.zip
(glyph-char): Fix for a new character code space (22-bit).
(glyph-face): Likewise.
-rw-r--r--lisp/disp-table.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 38f3ed6708a..d356be12d5b 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -198,12 +198,12 @@ X frame."
198;;;###autoload 198;;;###autoload
199(defun glyph-char (glyph) 199(defun glyph-char (glyph)
200 "Return the character of glyph code GLYPH." 200 "Return the character of glyph code GLYPH."
201 (logand glyph #x7ffff)) 201 (logand glyph #x3fffff))
202 202
203;;;###autoload 203;;;###autoload
204(defun glyph-face (glyph) 204(defun glyph-face (glyph)
205 "Return the face of glyph code GLYPH, or nil if glyph has default face." 205 "Return the face of glyph code GLYPH, or nil if glyph has default face."
206 (let ((face-id (lsh glyph -19))) 206 (let ((face-id (lsh glyph -22)))
207 (and (> face-id 0) 207 (and (> face-id 0)
208 (car (delq nil (mapcar (lambda (face) 208 (car (delq nil (mapcar (lambda (face)
209 (and (eq (get face 'face) face-id) 209 (and (eq (get face 'face) face-id)