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

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/11/04 11:01:09

Index: faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -b -r1.355 -r1.356
--- faces.el    31 Oct 2006 09:54:01 -0000      1.355
+++ faces.el    4 Nov 2006 11:01:09 -0000       1.356
@@ -32,9 +32,6 @@
   ;; Warning suppression -- can't require x-win in batch:
   (autoload 'xw-defined-colors "x-win"))
 
-(defvar faces-sample-overlay nil  
-  "Overlay for showing an example of a face.")
-
 (defvar help-xref-stack-item)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1255,16 +1252,6 @@
            (copy-face (car faces) (car faces) frame disp-frame)
            (setq faces (cdr faces)))))))
 
-(defun faces-sample-overlay (face)
-  "Insert sample text with FACE.
-
-If FACE is not a face or nil, use the default face."
-  (let ((f (if (facep face) face 'default))
-     (start (+ (point) 2))) ;; skip face and paren
-   (insert " (sample)")
-   (setq faces-sample-overlay (make-overlay start (1- (point))))
-   (overlay-put faces-sample-overlay 'face f)))
-
 
 (defun describe-face (face &optional frame)
   "Display the properties of face FACE on FRAME.
@@ -1306,7 +1293,7 @@
              (insert "   undefined face.\n")
            (let ((customize-label "customize this face")
                  file-name)
-             (faces-sample-overlay f)
+             (insert (concat " (" (propertize "sample" 'font-lock-face f) ")"))
              (princ (concat " (" customize-label ")\n"))
              (insert "Documentation: "
                      (or (face-documentation f)