# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 953598698 0
# Node ID 73c16c6e401ee95452a84f7b82a6404ce221ceb4
# Parent  2851f83ea43243d0c674438052c252936cc2d1be
(read-face-font): Fix TABLE arg to completing-read.
(describe-face): Include `font' attribute in the description.

diff -r 2851f83ea432 -r 73c16c6e401e lisp/faces.el
--- a/lisp/faces.el	Mon Mar 20 23:44:27 2000 +0000
+++ b/lisp/faces.el	Tue Mar 21 00:31:38 2000 +0000
@@ -897,8 +897,8 @@
   "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 @@
 		  (: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*"