diff lisp/mh-e/mh-speed.el @ 63531:60261c7a1b56

Revision: [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-428 Remove "-face" suffix from MH-E faces 2005-06-17 Miles Bader <[e-mail]> * lisp/mh-e/mh-customize.el (mh-folder-body, mh-folder-cur-msg) (mh-folder-cur-msg-number, mh-folder-date, mh-folder-followup) (mh-folder-msg-number, mh-folder-refiled, mh-folder-subject) (mh-folder-tick, mh-folder-to, mh-index-folder) (mh-letter-header-field, mh-show-cc, mh-show-date) (mh-show-header, mh-show-pgg-good, mh-show-pgg-unknown) (mh-show-pgg-bad, mh-show-signature, mh-show-to, mh-show-from) (mh-show-xface, mh-speedbar-folder, mh-speedbar-selected-folder) (mh-speedbar-folder-with-unseen-messages) (mh-speedbar-selected-folder-with-unseen-messages) (mh-folder-msg-number, mh-folder-subject, mh-folder-followup) (mh-folder-subject): Remove "-face" suffix from face names. (mh-folder-body, mh-folder-cur-msg, mh-folder-cur-msg-number) (mh-folder-date-face, mh-folder-followup-face) (mh-folder-msg-number-face, mh-folder-refiled-face) (mh-folder-subject-face, mh-folder-tick-face, mh-folder-to-face) (mh-index-folder-face, mh-letter-header-field-face) (mh-show-cc-face, mh-show-date-face, mh-show-header-face) (mh-show-pgg-good-face, mh-show-pgg-unknown-face) (mh-show-pgg-bad-face, mh-show-signature-face, mh-show-to-face) (mh-show-from-face, mh-show-xface-face, mh-speedbar-folder-face) (mh-speedbar-selected-folder-face) (mh-speedbar-folder-with-unseen-messages-face) (mh-speedbar-selected-folder-with-unseen-messages-face): New backward-compatibility aliases for renamed faces. (mh-folder-body-face, mh-folder-cur-msg-face) (mh-folder-cur-msg-number-face, mh-folder-date-face) (mh-folder-followup-face, mh-folder-msg-number-face) (mh-folder-deleted-face, mh-folder-refiled-face) (mh-folder-subject-face, mh-folder-address-face) (mh-folder-scan-format-face, mh-folder-to-face) (mh-index-folder-face, mh-show-cc-face, mh-show-date-face) (mh-show-header-face, mh-show-pgg-good-face) (mh-show-pgg-unknown-face, mh-show-pgg-bad-face) (mh-show-to-face, mh-show-from-face, mh-show-subject-face) (mh-speedbar-folder-with-unseen-messages) (mh-speedbar-selected-folder-with-unseen-messages): Use renamed MH-E faces. * lisp/mh-e/mh-utils.el (mh-letter-font-lock-keywords) (mh-face-display-function): Use renamed MH-E faces. * lisp/mh-e/mh-speed.el (mh-folder-speedbar-buttons) (mh-speed-update-current-folder, mh-speed-normal-face) (mh-speed-bold-face, mh-speed-add-buttons) (mh-speed-invalidate-map): Likewise. * lisp/mh-e/mh-mime.el (mh-signature-highlight): Likewise.

--- a/lisp/mh-e/mh-speed.el	Fri Jun 17 01:07:30 2005 +0000
+++ b/lisp/mh-e/mh-speed.el	Fri Jun 17 01:29:30 2005 +0000
@@ -1,6 +1,6 @@
 ;;; mh-speed.el --- Speedbar interface for MH-E.
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <[e-mail]>
 ;; Maintainer: Bill Wohler <[e-mail]>
@@ -67,7 +67,7 @@
     (erase-buffer)
     (clrhash mh-speed-folder-map)
     (speedbar-make-tag-line 'bracket ?+ 'mh-speed-toggle nil " " 'ignore nil
-                            'mh-speedbar-folder-face 0)
+                            'mh-speedbar-folder 0)
     (forward-line -1)
     (setf (gethash nil mh-speed-folder-map)
           (set-marker (or (gethash nil mh-speed-folder-map) (make-marker))
@@ -149,12 +149,11 @@
       (set-buffer speedbar-buffer)
 
       ;; Remove highlight from previous match...
-      (mh-speed-highlight mh-speed-last-selected-folder
-                          'mh-speedbar-folder-face)
+      (mh-speed-highlight mh-speed-last-selected-folder 'mh-speedbar-folder)
 
       ;; If we found a match highlight it...
       (when (mh-speed-goto-folder newcf)
-        (mh-speed-highlight newcf 'mh-speedbar-selected-folder-face))
+        (mh-speed-highlight newcf 'mh-speedbar-selected-folder))
 
       (setq mh-speed-last-selected-folder newcf)
       (speedbar-position-cursor-on-line)
@@ -166,18 +165,18 @@
 
 (defun mh-speed-normal-face (face)
   "Return normal face for given FACE."
-  (cond ((eq face 'mh-speedbar-folder-with-unseen-messages-face)
-         'mh-speedbar-folder-face)
-        ((eq face 'mh-speedbar-selected-folder-with-unseen-messages-face)
-         'mh-speedbar-selected-folder-face)
+  (cond ((eq face 'mh-speedbar-folder-with-unseen-messages)
+         'mh-speedbar-folder)
+        ((eq face 'mh-speedbar-selected-folder-with-unseen-messages)
+         'mh-speedbar-selected-folder)
         (t face)))
 
 (defun mh-speed-bold-face (face)
   "Return bold face for given FACE."
-  (cond ((eq face 'mh-speedbar-folder-face)
-         'mh-speedbar-folder-with-unseen-messages-face)
-        ((eq face 'mh-speedbar-selected-folder-face)
-         'mh-speedbar-selected-folder-with-unseen-messages-face)
+  (cond ((eq face 'mh-speedbar-folder)
+         'mh-speedbar-folder-with-unseen-messages)
+        ((eq face 'mh-speedbar-selected-folder)
+         'mh-speedbar-selected-folder-with-unseen-messages)
         (t face)))
 
 (defun mh-speed-highlight (folder face)
@@ -272,8 +271,8 @@
                       ""))
             'mh-speed-view nil
             (if (and counts (> (car counts) 0))
-                'mh-speedbar-folder-with-unseen-messages-face
-              'mh-speedbar-folder-face)
+                'mh-speedbar-folder-with-unseen-messages
+              'mh-speedbar-folder)
             level)
            (save-excursion
              (forward-line -1)
@@ -496,8 +495,7 @@
               (add-text-properties
                (line-beginning-position) (1+ (line-beginning-position))
                `(mh-children-p ,(equal parent-change ?+)))))
-          (mh-speed-highlight mh-speed-last-selected-folder
-                              'mh-speedbar-folder-face)
+          (mh-speed-highlight mh-speed-last-selected-folder 'mh-speedbar-folder)
           (setq mh-speed-last-selected-folder nil)
           (setq mh-speed-refresh-flag t)))
       (when (equal folder "")