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

[Richard M . Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.299 emacs/lisp/faces.el:1.300
*** emacs/lisp/faces.el:1.299   Sat Jan  1 14:21:37 2005
--- emacs/lisp/faces.el Thu Feb  3 06:47:16 2005
***************
*** 1143,1157 ****
  ;; conflict with Lucid, which uses that name differently.
  
  (defvar help-xref-stack)
! (defun list-faces-display ()
    "List all faces, using the same sample text in each.
  The sample text is a string that comes from the variable
! `list-faces-sample-text'."
!   (interactive)
    (let ((faces (sort (face-list) #'string-lessp))
-       (face nil)
        (frame (selected-frame))
        disp-frame window face-name)
      (with-output-to-temp-buffer "*Faces*"
        (save-excursion
        (set-buffer standard-output)
--- 1143,1168 ----
  ;; conflict with Lucid, which uses that name differently.
  
  (defvar help-xref-stack)
! (defun list-faces-display (&optional regexp)
    "List all faces, using the same sample text in each.
  The sample text is a string that comes from the variable
! `list-faces-sample-text'.
! 
! If REGEXP is non-nil, list only those faces with names matching
! this regular expression.  When called interactively with a prefix
! arg, prompt for a regular expression."
!   (interactive (list (and current-prefix-arg
!                           (read-string "List faces matching regexp: "))))
    (let ((faces (sort (face-list) #'string-lessp))
        (frame (selected-frame))
        disp-frame window face-name)
+     (when (> (length regexp) 0)
+       (setq faces
+             (delq nil
+                   (mapcar (lambda (f)
+                             (when (string-match regexp (symbol-name f))
+                               f))
+                           faces))))
      (with-output-to-temp-buffer "*Faces*"
        (save-excursion
        (set-buffer standard-output)
***************
*** 1164,1172 ****
           "\\[help-follow] on a face name to customize it\n"
           "or on its sample text for a description of the face.\n\n")))
        (setq help-xref-stack nil)
!       (while faces
!         (setq face (car faces))
!         (setq faces (cdr faces))
          (setq face-name (symbol-name face))
          (insert (format "%25s " face-name))
          ;; Hyperlink to a customization buffer for the face.  Using
--- 1175,1181 ----
           "\\[help-follow] on a face name to customize it\n"
           "or on its sample text for a description of the face.\n\n")))
        (setq help-xref-stack nil)
!       (dolist (face faces)
          (setq face-name (symbol-name face))
          (insert (format "%25s " face-name))
          ;; Hyperlink to a customization buffer for the face.  Using
***************
*** 1208,1213 ****
--- 1217,1223 ----
            (copy-face (car faces) (car faces) frame disp-frame)
            (setq faces (cdr faces)))))))
  
+ 
  (defun describe-face (face &optional frame)
    "Display the properties of face FACE on FRAME.
  Interactively, FACE defaults to the faces of the character after point