[Emacs-diffs] emacs/lisp faces.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/01/09 14:11:12

Modified files:
        lisp           : faces.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/faces.el?cvsroot=emacs&r1=1.434&r2=1.435

Patches:
Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- faces.el    5 Jan 2009 03:19:07 -0000       1.434
+++ faces.el    9 Jan 2009 14:11:12 -0000       1.435
@@ -988,7 +988,7 @@
          (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 @@
        (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