(face-valid-attribute-values): Fix handling the value

of (font-family-list) and font-XXX-table.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b60e3a7..f7a67ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Kenichi Handa  <handa@m17n.org>
+
+       * faces.el (face-valid-attribute-values): Fix handling the value
+       of (font-family-list) and font-XXX-table.
+
 2008-08-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * proced.el (proced-menu): Bind the correct function to for toggling.

diff --git a/lisp/faces.el b/lisp/faces.el
index 76bb029..4151885 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -978,20 +978,20 @@ an integer value."
          (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))