[Emacs-diffs] emacs/lisp faces.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/31 01:32:59

Modified files:
        lisp           : faces.el 

Log message:
        (describe-face): Adjust the output format to be more like
        describe-variable, and to mention (obsolete) face aliases.
        Adjust the whitespace so that help-setup-xref works.

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

Patches:
Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -b -r1.444 -r1.445
--- faces.el    13 Aug 2009 15:59:38 -0000      1.444
+++ faces.el    31 Aug 2009 01:32:58 -0000      1.445
@@ -1,7 +1,8 @@
 ;;; faces.el --- Lisp faces
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 
Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1368,10 +1369,29 @@
                    file-name)
                (insert (concat " (" (propertize "sample" 'font-lock-face f) 
")"))
                (princ (concat " (" customize-label ")\n"))
-               (insert "Documentation: "
-                       (or (face-documentation f)
+               ;; FIXME not sure how much of this belongs here, and
+               ;; how much in `face-documentation'.  The latter is
+               ;; not used much, but needs to return nil for
+               ;; undocumented faces.
+               (let ((alias (get f 'face-alias))
+                     (face f)
+                     obsolete)
+                 (when alias
+                   (setq face alias)
+                   (insert
+                    (format "\n  %s is an alias for the face `%s'.\n%s"
+                            f alias
+                            (if (setq obsolete (get f 'obsolete-face))
+                                (format "  This face is obsolete%s; use `%s' 
instead.\n"
+                                        (if (stringp obsolete)
+                                            (format " since %s" obsolete)
+                                          "")
+                                        alias)
+                              ""))))
+                 (insert "\nDocumentation:\n"
+                         (or (face-documentation face)
                            "Not documented as a face.")
-                       "\n")
+                         "\n\n"))
                (with-current-buffer standard-output
                  (save-excursion
                    (re-search-backward