From: Kenichi Handa <handa@m17n.org>
Date: Mon, 28 May 2007 11:59:10 +0000 (+0000)
Subject: (glyph-char): Fix for a new character code space (22-bit).
X-Git-Tag: emacs-pretest-23.0.90~8295^2~494
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29f035645ed9a7d856ac57f286e28b4dc7c08455;p=emacs.git

(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 38f3ed6708a..d356be12d5b 100644
--- 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)