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

of (font-family-list) and font-XXX-table.
This commit is contained in:
Kenichi Handa 2008-08-06 12:19:35 +00:00
parent 295b47d8c5
commit e83eedbf8d
2 changed files with 9 additions and 4 deletions

View file

@ -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.

View file

@ -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))