[Emacs-diffs] Changes to emacs/lisp/faces.el

[Richard M . Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.304 emacs/lisp/faces.el:1.305
*** emacs/lisp/faces.el:1.304   Mon Apr 11 20:47:25 2005
--- emacs/lisp/faces.el Mon May 16 03:31:11 2005
***************
*** 1257,1273 ****
          (insert "Face: " (symbol-name f))
          (if (not (facep f))
              (insert "   undefined face.\n")
!           (let ((customize-label "customize this face"))
              (princ (concat " (" customize-label ")\n"))
              (insert "Documentation: "
                      (or (face-documentation f)
                          "Not documented as a face.")
!                     "\n\n")
              (with-current-buffer standard-output
                (save-excursion
                  (re-search-backward
                   (concat "\\(" customize-label "\\)") nil t)
                  (help-xref-button 1 'help-customize-face f)))
              (dolist (a attrs)
                (let ((attr (face-attribute f (car a) frame)))
                  (insert (make-string (- max-width (length (cdr a))) ?\ )
--- 1257,1288 ----
          (insert "Face: " (symbol-name f))
          (if (not (facep f))
              (insert "   undefined face.\n")
!           (let ((customize-label "customize this face")
!                 file-name)
              (princ (concat " (" customize-label ")\n"))
              (insert "Documentation: "
                      (or (face-documentation f)
                          "Not documented as a face.")
!                     "\n")
              (with-current-buffer standard-output
                (save-excursion
                  (re-search-backward
                   (concat "\\(" customize-label "\\)") nil t)
                  (help-xref-button 1 'help-customize-face f)))
+             ;; The next 4 sexps are copied from describe-function-1
+             ;; and simplified.
+             (setq file-name (symbol-file f 'defface))
+             (when file-name
+               (princ "Defined in `")
+               (princ file-name)
+               (princ "'")
+               ;; Make a hyperlink to the library.
+               (save-excursion
+                 (re-search-backward "`\\([^`']+\\)'" nil t)
+                 (help-xref-button 1 'help-face-def f file-name))
+               (princ ".")
+               (terpri)
+               (terpri))
              (dolist (a attrs)
                (let ((attr (face-attribute f (car a) frame)))
                  (insert (make-string (- max-width (length (cdr a))) ?\ )
***************
*** 2047,2053 ****
      (t :inverse-video t))
    "Basic face for highlighting trailing whitespace."
    :version "21.1"
!   :group 'font-lock                   ; like `show-trailing-whitespace'
    :group 'basic-faces)
  
  (defface escape-glyph '((((background dark)) :foreground "cyan")
--- 2062,2068 ----
      (t :inverse-video t))
    "Basic face for highlighting trailing whitespace."
    :version "21.1"
!   :group 'whitespace          ; like `show-trailing-whitespace'
    :group 'basic-faces)
  
  (defface escape-glyph '((((background dark)) :foreground "cyan")