Mercurial > emacs
changeset 97325:85f30f831ede
(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 | c4c2d8a98a03 |
children | 978f82d20794 |
files | lisp/faces.el |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
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))