[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: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/disp-table.el,v |
Date: |
Fri, 01 Feb 2008 16:02:54 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/02/01 16:01:31
Index: lisp/disp-table.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/disp-table.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- lisp/disp-table.el 8 Jan 2008 20:45:01 -0000 1.69
+++ lisp/disp-table.el 1 Feb 2008 16:01:11 -0000 1.70
@@ -125,7 +125,7 @@
(or standard-display-table
(setq standard-display-table (make-display-table)))
(while (<= l h)
- (if (and (>= l ?\s) (char-valid-p l))
+ (if (and (>= l ?\s) (characterp l))
(aset standard-display-table l nil))
(setq l (1+ l))))
@@ -189,20 +189,20 @@
(defun make-glyph-code (char &optional face)
"Return a glyph code representing char CHAR with face FACE."
;; Due to limitations on Emacs integer values, faces with
- ;; face id greater that 4091 are silently ignored.
- (if (and face (<= (face-id face) #xfff))
- (logior char (lsh (face-id face) 19))
+ ;; face id greater that 512 are silently ignored.
+ (if (and face (<= (face-id face) #x1ff))
+ (logior char (lsh (face-id face) 22))
char))
;;;###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)
- [Emacs-diffs] Changes to emacs/lisp/disp-table.el,v,
Miles Bader <=