# HG changeset patch # User Miles Bader # Date 1118971770 0 # Node ID 60261c7a1b56aca7971b776d2b7a96e728e7ccc0 # Parent 3e5fbe22133221e49642e15695aeb7320df04e2b Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-428 Remove "-face" suffix from MH-E faces 2005-06-17 Miles Bader * 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. diff -r 3e5fbe221332 -r 60261c7a1b56 lisp/mh-e/ChangeLog --- a/lisp/mh-e/ChangeLog Fri Jun 17 01:07:30 2005 +0000 +++ b/lisp/mh-e/ChangeLog Fri Jun 17 01:29:30 2005 +0000 @@ -1,3 +1,52 @@ +2005-06-17 Miles Bader + + * 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. + + * mh-utils.el (mh-letter-font-lock-keywords) + (mh-face-display-function): Use renamed MH-E faces. + * 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. + * mh-mime.el (mh-signature-highlight): Likewise. + 2005-06-16 Juanma Barranquero * mh-comp.el (mh-send-sub): diff -r 3e5fbe221332 -r 60261c7a1b56 lisp/mh-e/mh-customize.el --- a/lisp/mh-e/mh-customize.el Fri Jun 17 01:07:30 2005 +0000 +++ b/lisp/mh-e/mh-customize.el Fri Jun 17 01:29:30 2005 +0000 @@ -2144,9 +2144,9 @@ ;;; Faces Used in Scan Listing (:group 'mh-folder-faces) -(defvar mh-folder-body-face 'mh-folder-body-face +(defvar mh-folder-body-face 'mh-folder-body "Face used to highlight body text in MH-Folder buffers.") -(defface mh-folder-body-face +(defface mh-folder-body '((((type tty) (class color)) (:foreground "green")) (((class grayscale) (background light)) (:foreground "DimGray" :italic t)) (((class grayscale) (background dark)) (:foreground "LightGray" :italic t)) @@ -2155,10 +2155,14 @@ (t (:italic t))) "Face used to highlight body text in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-body 'face-alias 'mh-folder-body) +;; backward-compatibility alias +(put ''mh-folder-body-face 'face-alias ''mh-folder-body) -(defvar mh-folder-cur-msg-face 'mh-folder-cur-msg-face +(defvar mh-folder-cur-msg-face 'mh-folder-cur-msg "Face used for the current message line in MH-Folder buffers.") -(defface mh-folder-cur-msg-face +(defface mh-folder-cur-msg '((((type tty pc) (class color)) (:background "LightGreen")) (((class color) (background light)) @@ -2170,10 +2174,14 @@ (t (:underline t))) "Face used for the current message line in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-cur-msg 'face-alias 'mh-folder-cur-msg) +;; backward-compatibility alias +(put ''mh-folder-cur-msg-face 'face-alias ''mh-folder-cur-msg) -(defvar mh-folder-cur-msg-number-face 'mh-folder-cur-msg-number-face +(defvar mh-folder-cur-msg-number-face 'mh-folder-cur-msg-number "Face used to highlight the current message in MH-Folder buffers.") -(defface mh-folder-cur-msg-number-face +(defface mh-folder-cur-msg-number '((((type tty) (class color)) (:foreground "cyan" :weight bold)) (((class grayscale) (background light)) (:foreground "LightGray" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) @@ -2182,10 +2190,14 @@ (t (:bold t))) "Face used to highlight the current message in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-cur-msg-number 'face-alias 'mh-folder-cur-msg-number) +;; backward-compatibility alias +(put ''mh-folder-cur-msg-number-face 'face-alias ''mh-folder-cur-msg-number) -(defvar mh-folder-date-face 'mh-folder-date-face +(defvar mh-folder-date-face 'mh-folder-date "Face used to highlight the date in MH-Folder buffers.") -(defface mh-folder-date-face +(defface mh-folder-date '((((class color) (background light)) (:foreground "snow4")) (((class color) (background dark)) @@ -2194,10 +2206,12 @@ (:bold t))) "Face used to highlight the date in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-date-face 'face-alias 'mh-folder-date) -(defvar mh-folder-followup-face 'mh-folder-followup-face +(defvar mh-folder-followup-face 'mh-folder-followup "Face used to highlight Re: subject text in MH-Folder buffers.") -(defface mh-folder-followup-face +(defface mh-folder-followup '((((class color) (background light)) (:foreground "blue3")) (((class color) (background dark)) @@ -2206,10 +2220,12 @@ (:bold t))) "Face used to highlight Re: subject text in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-followup-face 'face-alias 'mh-folder-followup) -(defvar mh-folder-msg-number-face 'mh-folder-msg-number-face +(defvar mh-folder-msg-number-face 'mh-folder-msg-number "Face used to highlight the message number in MH-Folder buffers.") -(defface mh-folder-msg-number-face +(defface mh-folder-msg-number '((((class color) (background light)) (:foreground "snow4")) (((class color) (background dark)) @@ -2218,14 +2234,16 @@ (:bold t))) "Face used to highlight the message number in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-msg-number-face 'face-alias 'mh-folder-msg-number) -(defvar mh-folder-deleted-face 'mh-folder-deleted-face +(defvar mh-folder-deleted-face 'mh-folder-deleted "Face used to highlight deleted messages in MH-Folder buffers.") -(copy-face 'mh-folder-msg-number-face 'mh-folder-deleted-face) +(copy-face 'mh-folder-msg-number 'mh-folder-deleted) -(defvar mh-folder-refiled-face 'mh-folder-refiled-face +(defvar mh-folder-refiled-face 'mh-folder-refiled "Face used to highlight refiled messages in MH-Folder buffers.") -(defface mh-folder-refiled-face +(defface mh-folder-refiled '((((type tty) (class color)) (:foreground "yellow" :weight light)) (((class grayscale) (background light)) (:foreground "Gray90" :bold t :italic t)) @@ -2236,12 +2254,14 @@ (t (:bold t :italic t))) "Face used to highlight refiled messages in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-refiled-face 'face-alias 'mh-folder-refiled) -(defvar mh-folder-subject-face 'mh-folder-subject-face +(defvar mh-folder-subject-face 'mh-folder-subject "Face used to highlight subject text in MH-Folder buffers.") (if (boundp 'facemenu-unlisted-faces) (add-to-list 'facemenu-unlisted-faces "^mh-folder")) -(defface mh-folder-subject-face +(defface mh-folder-subject '((((class color) (background light)) (:foreground "blue4")) (((class color) (background dark)) @@ -2250,25 +2270,29 @@ (:bold t))) "Face used to highlight subject text in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-subject-face 'face-alias 'mh-folder-subject) -(defface mh-folder-tick-face +(defface mh-folder-tick '((((class color) (background dark)) (:background "#dddf7e")) (((class color) (background light)) (:background "#dddf7e")) (t (:underline t))) "Face used to show ticked messages." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-tick-face 'face-alias 'mh-folder-tick) -(defvar mh-folder-address-face 'mh-folder-address-face +(defvar mh-folder-address-face 'mh-folder-address "Face used to highlight the address in MH-Folder buffers.") -(copy-face 'mh-folder-subject-face 'mh-folder-address-face) +(copy-face 'mh-folder-subject 'mh-folder-address) -(defvar mh-folder-scan-format-face 'mh-folder-scan-format-face +(defvar mh-folder-scan-format-face 'mh-folder-scan-format "Face used to highlight `mh-scan-format-regexp' matches in MH-Folder buffers.") -(copy-face 'mh-folder-followup-face 'mh-folder-scan-format-face) +(copy-face 'mh-folder-followup 'mh-folder-scan-format) -(defvar mh-folder-to-face 'mh-folder-to-face +(defvar mh-folder-to-face 'mh-folder-to "Face used to highlight the To: string in MH-Folder buffers.") -(defface mh-folder-to-face +(defface mh-folder-to '((((type tty) (class color)) (:foreground "green")) (((class grayscale) (background light)) (:foreground "DimGray" :italic t)) (((class grayscale) (background dark)) (:foreground "LightGray" :italic t)) @@ -2277,14 +2301,16 @@ (t (:italic t))) "Face used to highlight the To: string in MH-Folder buffers." :group 'mh-folder-faces) +;; backward-compatibility alias +(put 'mh-folder-to-face 'face-alias 'mh-folder-to) ;;; Faces Used in Searching (:group 'mh-index-faces) -(defvar mh-index-folder-face 'mh-index-folder-face +(defvar mh-index-folder-face 'mh-index-folder "Face used to highlight folders in MH-Index buffers.") -(defface mh-index-folder-face +(defface mh-index-folder '((((class color) (background light)) (:foreground "dark green" :bold t)) (((class color) (background dark)) @@ -2293,12 +2319,14 @@ (:bold t))) "Face used to highlight folders in MH-Index buffers." :group 'mh-index-faces) +;; backward-compatibility alias +(put 'mh-index-folder-face 'face-alias 'mh-index-folder) ;;; Faces Used in Message Drafts (:group 'mh-letter-faces) -(defface mh-letter-header-field-face +(defface mh-letter-header-field '((((class color) (background light)) (:background "gray90")) (((class color) (background dark)) @@ -2306,14 +2334,16 @@ (t (:bold t))) "Face used to display header fields in draft buffers." :group 'mh-letter-faces) +;; backward-compatibility alias +(put 'mh-letter-header-field-face 'face-alias 'mh-letter-header-field) ;;; Faces Used in Message Display (:group 'mh-show-faces) -(defvar mh-show-cc-face 'mh-show-cc-face +(defvar mh-show-cc-face 'mh-show-cc "Face used to highlight cc: header fields.") -(defface mh-show-cc-face +(defface mh-show-cc '((((type tty) (class color)) (:foreground "yellow" :weight light)) (((class grayscale) (background light)) (:foreground "Gray90" :bold t :italic t)) @@ -2324,10 +2354,12 @@ (t (:bold t :italic t))) "Face used to highlight cc: header fields." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-cc-face 'face-alias 'mh-show-cc) -(defvar mh-show-date-face 'mh-show-date-face +(defvar mh-show-date-face 'mh-show-date "Face used to highlight the Date: header field.") -(defface mh-show-date-face +(defface mh-show-date '((((type tty) (class color)) (:foreground "green")) (((class grayscale) (background light)) (:foreground "Gray90" :bold t)) (((class grayscale) (background dark)) (:foreground "DimGray" :bold t)) @@ -2336,10 +2368,12 @@ (t (:bold t :underline t))) "Face used to highlight the Date: header field." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-date-face 'face-alias 'mh-show-date) -(defvar mh-show-header-face 'mh-show-header-face +(defvar mh-show-header-face 'mh-show-header "Face used to deemphasize unspecified header fields.") -(defface mh-show-header-face +(defface mh-show-header '((((type tty) (class color)) (:foreground "green")) (((class grayscale) (background light)) (:foreground "DimGray" :italic t)) (((class grayscale) (background dark)) (:foreground "LightGray" :italic t)) @@ -2348,40 +2382,50 @@ (t (:italic t))) "Face used to deemphasize unspecified header fields." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-header-face 'face-alias 'mh-show-header) -(defvar mh-show-pgg-good-face 'mh-show-pgg-good-face +(defvar mh-show-pgg-good-face 'mh-show-pgg-good "Face used to highlight a good PGG signature.") -(defface mh-show-pgg-good-face +(defface mh-show-pgg-good '((t (:bold t :foreground "LimeGreen"))) "Face used to highlight a good PGG signature." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-pgg-good-face 'face-alias 'mh-show-pgg-good) -(defvar mh-show-pgg-unknown-face 'mh-show-pgg-unknown-face +(defvar mh-show-pgg-unknown-face 'mh-show-pgg-unknown "Face used to highlight a PGG signature whose status is unknown. This face is also used for a signature when the signer is untrusted.") -(defface mh-show-pgg-unknown-face +(defface mh-show-pgg-unknown '((t (:bold t :foreground "DarkGoldenrod2"))) "Face used to highlight a PGG signature whose status is unknown. This face is also used for a signature when the signer is untrusted." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-pgg-unknown-face 'face-alias 'mh-show-pgg-unknown) -(defvar mh-show-pgg-bad-face 'mh-show-pgg-bad-face +(defvar mh-show-pgg-bad-face 'mh-show-pgg-bad "Face used to highlight a bad PGG signature.") -(defface mh-show-pgg-bad-face +(defface mh-show-pgg-bad '((t (:bold t :foreground "DeepPink1"))) "Face used to highlight a bad PGG signature." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-pgg-bad-face 'face-alias 'mh-show-pgg-bad) -(defface mh-show-signature-face +(defface mh-show-signature '((t (:italic t))) "Face used to highlight the message signature." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-signature-face 'face-alias 'mh-show-signature) -(defvar mh-show-to-face 'mh-show-to-face +(defvar mh-show-to-face 'mh-show-to "Face used to highlight the To: header field.") (if (boundp 'facemenu-unlisted-faces) (add-to-list 'facemenu-unlisted-faces "^mh-show")) -(defface mh-show-to-face +(defface mh-show-to '((((class grayscale) (background light)) (:foreground "DimGray" :underline t)) (((class grayscale) (background dark)) @@ -2391,10 +2435,12 @@ (t (:underline t))) "Face used to highlight the To: header field." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-to-face 'face-alias 'mh-show-to) -(defvar mh-show-from-face 'mh-show-from-face +(defvar mh-show-from-face 'mh-show-from "Face used to highlight the From: header field.") -(defface mh-show-from-face +(defface mh-show-from '((((class color) (background light)) (:foreground "red3")) (((class color) (background dark)) @@ -2403,30 +2449,36 @@ (:bold t))) "Face used to highlight the From: header field." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-from-face 'face-alias 'mh-show-from) -(defface mh-show-xface-face +(defface mh-show-xface '((t (:foreground "black" :background "white"))) "Face used to display the X-Face image. The background and foreground is used in the image." :group 'mh-show-faces) +;; backward-compatibility alias +(put 'mh-show-xface-face 'face-alias 'mh-show-xface) -(defvar mh-show-subject-face 'mh-show-subject-face +(defvar mh-show-subject-face 'mh-show-subject "Face used to highlight the Subject: header field.") -(copy-face 'mh-folder-subject-face 'mh-show-subject-face) +(copy-face 'mh-folder-subject 'mh-show-subject) ;;; Faces Used in Speedbar (:group 'mh-speed-faces) -(defface mh-speedbar-folder-face +(defface mh-speedbar-folder '((((class color) (background light)) (:foreground "blue4")) (((class color) (background dark)) (:foreground "light blue"))) "Face used for folders in the speedbar buffer." :group 'mh-speed-faces) +;; backward-compatibility alias +(put 'mh-speedbar-folder-face 'face-alias 'mh-speedbar-folder) -(defface mh-speedbar-selected-folder-face +(defface mh-speedbar-selected-folder '((((class color) (background light)) (:foreground "red1" :underline t)) (((class color) (background dark)) @@ -2434,16 +2486,22 @@ (t (:underline t))) "Face used for the current folder." :group 'mh-speed-faces) +;; backward-compatibility alias +(put 'mh-speedbar-selected-folder-face 'face-alias 'mh-speedbar-selected-folder) -(defface mh-speedbar-folder-with-unseen-messages-face - '((t (:inherit mh-speedbar-folder-face :bold t))) +(defface mh-speedbar-folder-with-unseen-messages + '((t (:inherit mh-speedbar-folder :bold t))) "Face used for folders in the speedbar buffer which have unread messages." :group 'mh-speed-faces) +;; backward-compatibility alias +(put 'mh-speedbar-folder-with-unseen-messages-face 'face-alias 'mh-speedbar-folder-with-unseen-messages) -(defface mh-speedbar-selected-folder-with-unseen-messages-face - '((t (:inherit mh-speedbar-selected-folder-face :bold t))) +(defface mh-speedbar-selected-folder-with-unseen-messages + '((t (:inherit mh-speedbar-selected-folder :bold t))) "Face used for the current folder when it has unread messages." :group 'mh-speed-faces) +;; backward-compatibility alias +(put 'mh-speedbar-selected-folder-with-unseen-messages-face 'face-alias 'mh-speedbar-selected-folder-with-unseen-messages) ;;; Local Variables: ;;; indent-tabs-mode: nil diff -r 3e5fbe221332 -r 60261c7a1b56 lisp/mh-e/mh-mime.el --- a/lisp/mh-e/mh-mime.el Fri Jun 17 01:07:30 2005 +0000 +++ b/lisp/mh-e/mh-mime.el Fri Jun 17 01:29:30 2005 +0000 @@ -1,7 +1,7 @@ ;;; mh-mime.el --- MH-E support for composing MIME messages ;; Copyright (C) 1993, 1995, -;; 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Wohler ;; Maintainer: Bill Wohler @@ -1059,11 +1059,11 @@ (when (re-search-backward regexp nil t) (mh-do-in-gnu-emacs (let ((ov (make-overlay (point) (point-max)))) - (overlay-put ov 'face 'mh-show-signature-face) + (overlay-put ov 'face 'mh-show-signature) (overlay-put ov 'evaporate t))) (mh-do-in-xemacs (set-extent-property (make-extent (point) (point-max)) - 'face 'mh-show-signature-face)))))) + 'face 'mh-show-signature)))))) (mh-do-in-xemacs (defvar dots) diff -r 3e5fbe221332 -r 60261c7a1b56 lisp/mh-e/mh-speed.el --- 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 ;; Maintainer: Bill Wohler @@ -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 "") diff -r 3e5fbe221332 -r 60261c7a1b56 lisp/mh-e/mh-utils.el --- a/lisp/mh-e/mh-utils.el Fri Jun 17 01:07:30 2005 +0000 +++ b/lisp/mh-e/mh-utils.el Fri Jun 17 01:29:30 2005 +0000 @@ -1,7 +1,7 @@ ;;; mh-utils.el --- MH-E code needed for both sending and reading ;; Copyright (C) 1993, 1995, 1997, -;; 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Bill Wohler ;; Maintainer: Bill Wohler @@ -406,7 +406,7 @@ (defvar mh-letter-font-lock-keywords `(,@mh-show-font-lock-keywords-with-cite - (mh-font-lock-field-data (1 'mh-letter-header-field-face prepend t)))) + (mh-font-lock-field-data (1 'mh-letter-header-field prepend t)))) (defun mh-show-font-lock-fontify-region (beg end loudly) "Limit font-lock in `mh-show-mode' to the header. @@ -1218,8 +1218,8 @@ (mh-funcall-if-exists insert-image (create-image raw type t - :foreground (face-foreground 'mh-show-xface-face) - :background (face-background 'mh-show-xface-face)) + :foreground (face-foreground 'mh-show-xface) + :background (face-background 'mh-show-xface)) " "))) ;; XEmacs (mh-do-in-xemacs @@ -1237,7 +1237,7 @@ (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (vector 'xface ':data (concat "X-Face: " x-face)))) - 'mh-show-xface-face)) + 'mh-show-xface)) ;; Otherwise try external support with x-face... ((and (eq type 'pbm) (fboundp 'x-face-xmas-wl-display-x-face)