(read-face-font): Fix TABLE arg to completing-read.

(describe-face): Include `font' attribute in the description.

diff --git a/lisp/faces.el b/lisp/faces.el
index 4bdc107275f3f2f4c28e809bd217728ccddf2c79..a7aad7f8e7f386ad7cdfb73f1d6e8dcd80b461b2 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -897,8 +897,8 @@ of a global face.  Value is the new attribute value."
   "Read the name of a font for FACE on FRAME.
 If optional argument FRAME Is nil or omitted, use the selected frame."
   (let ((completion-ignore-case t))
-    (completing-read "Set font attributes of face %s from font: "
-                    face (x-list-fonts "*" nil frame))))
+    (completing-read (format "Set font attributes of face %s from font: " face)
+                    (mapcar 'list (x-list-fonts "*" nil frame)))))
 
 
 (defun read-all-face-attributes (face &optional frame)
@@ -1036,7 +1036,8 @@ If FRAME is omitted or nil, use the selected frame."
                  (:strike-through . "Strike-through")
                  (:box . "Box")
                  (:inverse-video . "Inverse")
-                 (:stipple . "Stipple")))
+                 (:stipple . "Stipple")
+                 (:font . "Font or fontset")))
        (max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
                                        attrs))))
     (with-output-to-temp-buffer "*Help*"