From e83eedbf8dc964366e4efe39a4f1fc7a412c1b42 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 6 Aug 2008 12:19:35 +0000 Subject: [PATCH] (face-valid-attribute-values): Fix handling the value of (font-family-list) and font-XXX-table. --- lisp/ChangeLog | 5 +++++ lisp/faces.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b60e3a75929..f7a67ae83a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-08-06 Kenichi Handa + + * faces.el (face-valid-attribute-values): Fix handling the value + of (font-family-list) and font-XXX-table. + 2008-08-06 Dan Nicolaescu * proced.el (proced-menu): Bind the correct function to for toggling. diff --git a/lisp/faces.el b/lisp/faces.el index 76bb02939f5..4151885819e 100644 --- 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)) -- 2.39.2