[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/disp-table.el,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/disp-table.el,v |
Date: |
Wed, 27 Feb 2008 22:53:11 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 08/02/27 22:53:11
Index: disp-table.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/disp-table.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- disp-table.el 1 Feb 2008 16:01:11 -0000 1.70
+++ disp-table.el 27 Feb 2008 22:53:11 -0000 1.71
@@ -190,19 +190,27 @@
"Return a glyph code representing char CHAR with face FACE."
;; Due to limitations on Emacs integer values, faces with
;; face id greater that 512 are silently ignored.
- (if (and face (<= (face-id face) #x1ff))
- (logior char (lsh (face-id face) 22))
- char))
+ (if (not face)
+ char
+ (let ((fid (face-id face)))
+ (cond
+ ((not fid) (error "unknown face"))
+ ((< fid 64) ; we have 32 - 3(LSB) - 1(SIGN) - 22(CHAR) = 6 bits for
face id
+ (logior char (lsh fid 22)))
+ (t (cons char fid))))))
;;;###autoload
(defun glyph-char (glyph)
"Return the character of glyph code GLYPH."
- (logand glyph #x3fffff))
+ (if (consp glyph)
+ (car glyph)
+ (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 -22)))
+
+ (let ((face-id (if (consp glyph) (cdr glyph) (lsh glyph -22))))
(and (> face-id 0)
(car (delq nil (mapcar (lambda (face)
(and (eq (get face 'face) face-id)