From: Kim F. Storm <storm@cua.dk>
Date: Wed, 14 Feb 2007 11:29:05 +0000 (+0000)
Subject: (latin1-display-char): Use make-glyph-code.
X-Git-Tag: emacs-pretest-22.0.94~201
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a184b00295e9960b7949712347c349df6fddf5c;p=emacs.git

(latin1-display-char): Use make-glyph-code.
---

diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 6b2b6c50760..7a78e6628b9 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -177,14 +177,10 @@ asis."
       (if (eq 'default latin1-display-face)
 	  (standard-display-ascii char (format latin1-display-format display))
 	(aset standard-display-table char
-	      (vconcat (mapcar (lambda (c)
-				 (logior c (lsh (face-id latin1-display-face)
-						19)))
+	      (vconcat (mapcar (lambda (c) (make-glyph-code c latin1-display-face))
 			       display))))
     (aset standard-display-table char
-	  (if (eq 'default latin1-display-face)
-	      display
-	    (logior display (lsh (face-id latin1-display-face) 19))))))
+	  (make-glyph-code display latin1-display-face))))
 
 (defun latin1-display-identities (charset)
   "Display each character in CHARSET as the corresponding Latin-1 character.