[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/descr-text.el,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/descr-text.el,v |
Date: |
Wed, 14 Feb 2007 11:28:31 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 07/02/14 11:28:31
Index: descr-text.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/descr-text.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- descr-text.el 21 Jan 2007 03:53:12 -0000 1.54
+++ descr-text.el 14 Feb 2007 11:28:31 -0000 1.55
@@ -528,11 +528,11 @@
(setq char (aref disp-vector i))
(aset disp-vector i
(cons char (describe-char-display
- pos (logand char #x7ffff)))))
+ pos (glyph-char char)))))
(format "by display table entry [%s] (see below)"
(mapconcat
#'(lambda (x)
- (format "?%c" (logand (car x) #x7ffff)))
+ (format "?%c" (glyph-char (car x))))
disp-vector " ")))
(composition
(let ((from (car composition))
@@ -627,25 +627,19 @@
(progn
(insert "these fonts (glyph codes):\n")
(dotimes (i (length disp-vector))
- (insert (logand (car (aref disp-vector i)) #x7ffff) ?:
+ (insert (glyph-char (car (aref disp-vector i))) ?:
(propertize " " 'display '(space :align-to 5))
(if (cdr (aref disp-vector i))
(format "%s (#x%02X)" (cadr (aref disp-vector i))
(cddr (aref disp-vector i)))
"-- no font --")
"\n")
- (when (> (car (aref disp-vector i)) #x7ffff)
- (let* ((face-id (lsh (car (aref disp-vector i)) -19))
- (face (car (delq nil (mapcar
- (lambda (face)
- (and (eq (face-id face)
- face-id) face))
- (face-list))))))
+ (let ((face (glyph-face (car (aref disp-vector i)))))
(when face
(insert (propertize " " 'display '(space :align-to 5))
"face: ")
(insert (concat "`" (symbol-name face) "'"))
- (insert "\n"))))))
+ (insert "\n")))))
(insert "these terminal codes:\n")
(dotimes (i (length disp-vector))
(insert (car (aref disp-vector i))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el,v,
Kim F. Storm <=