(glyph-char): Fix for a new character code space (22-bit).

(glyph-face): Likewise.

diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 38f3ed6708af2843218bb77023774662fff70ff9..d356be12d5b538c57d3b24125d411a6dcf7fbe1c 100644 (file)
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -198,12 +198,12 @@ X frame."
 ;;;###autoload
 (defun glyph-char (glyph)
   "Return the character of glyph code GLYPH."
-  (logand glyph #x7ffff))
+  (logand glyph #x3fffff))
 
 ;;;###autoload
 (defun glyph-face (glyph)
   "Return the face of glyph code GLYPH, or nil if glyph has default face."
-  (let ((face-id (lsh glyph -19)))
+  (let ((face-id (lsh glyph -22)))
     (and (> face-id 0)
         (car (delq nil (mapcar (lambda (face)
                                  (and (eq (get face 'face) face-id)