From: Kenichi Handa <handa@m17n.org>
Date: Fri, 4 Aug 2006 01:48:10 +0000 (+0000)
Subject: (describe-font): Improve docstring
X-Git-Tag: emacs-pretest-22.0.90~1117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fca31fbb6681f58052d28cd21f90b1510fe88292;p=emacs.git

(describe-font): Improve docstring
and error message.  Use frame-parameter (not frame-parameters).
---

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 0a2e5a7c325..57b77249ba8 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1039,18 +1039,28 @@ but still contains full information about each coding system."
 
 ;;;###autoload
 (defun describe-font (fontname)
-  "Display information about fonts which partially match FONTNAME."
-  (interactive "sFontname (default current choice for ASCII chars): ")
+  "Display information about a font whose name is FONTNAME.
+The font must be already used by Emacs."
+  (interactive "sFont name (default current choice for ASCII chars): ")
   (or (and window-system (fboundp 'fontset-list))
-      (error "No fontsets being used"))
-  (when (or (not fontname) (= (length fontname) 0))
-    (setq fontname (cdr (assq 'font (frame-parameters))))
-    (if (query-fontset fontname)
-	(setq fontname
-	      (nth 1 (assq 'ascii (aref (fontset-info fontname) 2))))))
-  (let ((font-info (font-info fontname)))
+      (error "No fonts being used"))
+  (let (fontset font-info)
+    (when (or (not fontname) (= (length fontname) 0))
+      (setq fontname (frame-parameter nil 'font))
+      ;; Check if FONTNAME is a fontset.
+      (if (query-fontset fontname)
+	  (setq fontset fontname
+		fontname (nth 1 (assq 'ascii
+				      (aref (fontset-info fontname) 2))))))
+    (setq font-info (font-info fontname))
     (if (null font-info)
-	(message "No matching font")
+	(if fontset
+	    ;; The font should be surely used.  So, there's some
+	    ;; problem about getting information about it.  It is
+	    ;; better to print the fontname to show which font has
+	    ;; this problem.
+	    (message "No information about \"%s\"" fontname)
+	  (message "No matching font being used"))
       (with-output-to-temp-buffer "*Help*"
 	(describe-font-internal font-info 'verbose)))))