Commit 95ac8fbd authored by Chong Yidong's avatar Chong Yidong
Browse files

(face-valid-attribute-values): Use string as value for :family

attribute.  Now, font-family-list returns a list of strings.
(x-font-family-list): Obsolete compatibility version of function
from xfaces.c.
parent 45c17811
......@@ -988,7 +988,7 @@ an integer value."
(case attribute
(:family
(if (window-system frame)
(mapcar #'(lambda (x) (cons (symbol-name x) x))
(mapcar (lambda (x) (cons x x))
(font-family-list))
;; Only one font on TTYs.
(list (cons "default" "default"))))
......@@ -2681,6 +2681,18 @@ If that can't be done, return nil."
(internal-frob-font-slant font "i")))
(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1")
(defun x-font-family-list (&optional frame)
"Return a list of available font families on FRAME.
If FRAME is omitted or nil, use the selected frame.
Value is a list of conses (FAMILY . FIXED-P) where FAMILY
is a font family, and FIXED-P is non-nil if fonts of that family
are fixed-pitch."
(if (fboundp 'font-family-list)
(mapcar (lambda (family) (cons family nil))
(font-family-list))
'(("default" . t))))
(make-obsolete 'x-font-family-list 'font-family-list "23.1")
(provide 'faces)
;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment