Mercurial > emacs

diff lisp/faces.el @ 97325:85f30f831ede

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(face-valid-attribute-values): Fix handling the value of (font-family-list) and font-XXX-table.
author Kenichi Handa <handa@m17n.org>
date Wed, 06 Aug 2008 12:19:24 +0000
parents 07311809a1f0
children 9632e46fbdc6
line wrap: on
line diff
--- a/lisp/faces.el	Wed Aug 06 10:15:11 2008 +0000
+++ b/lisp/faces.el	Wed Aug 06 12:19:24 2008 +0000
@@ -978,20 +978,20 @@
          (case attribute
            (:family
             (if (window-system frame)
-                (mapcar #'(lambda (x) (cons (car x) (car x)))
+                (mapcar #'(lambda (x) (cons (symbol-name x) x))
                         (font-family-list))
 	      ;; Only one font on TTYs.
 	      (list (cons "default" "default"))))
            (:foundry
 	    (list nil))
 	   (:width
-	    (mapcar #'(lambda (x) (cons (symbol-name (car x)) (car x)))
+	    (mapcar #'(lambda (x) (cons (symbol-name (aref x 1)) (aref x 1)))
 		    font-width-table))
            (:weight
-	    (mapcar #'(lambda (x) (cons (symbol-name (car x)) (car x)))
+	    (mapcar #'(lambda (x) (cons (symbol-name (aref x 1)) (aref x 1)))
 		    font-weight-table))
 	   (:slant
-	    (mapcar #'(lambda (x) (cons (symbol-name (car x)) (car x)))
+	    (mapcar #'(lambda (x) (cons (symbol-name (aref x 1)) (aref x 1)))
 		    font-slant-table))
 	   (:inverse-video
 	    (mapcar #'(lambda (x) (cons (symbol-name x) x))