1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 19:00:55 -08:00

Reverted wrong changes to rmail.el.

This commit is contained in:
Bastien Guerry 2008-02-12 07:13:29 +00:00
parent b96817c387
commit 926f559c27

View file

@ -345,19 +345,6 @@ See also `rmail-highlight-face'."
face) face)
:group 'rmail-headers) :group 'rmail-headers)
(defface rmail-header-name
'((t (:inherit font-lock-function-name-face)))
"Face to use for highlighting the header names."
:group 'rmail-headers
:version "23.1")
;;;###autoload
(defcustom rmail-header-name-face 'rmail-header-name "\
*Face to use for highlighting the header names."
:type '(choice (const :tag "Default" nil)
face)
:group 'rmail-headers)
;;;###autoload ;;;###autoload
(defcustom rmail-delete-after-output nil "\ (defcustom rmail-delete-after-output nil "\
*Non-nil means automatically delete a message that is copied to a file." *Non-nil means automatically delete a message that is copied to a file."
@ -711,19 +698,19 @@ The first parenthesized expression should match the MIME-charset name.")
"\n")) "\n"))
nil) nil)
(setq rmail-font-lock-keywords (defvar rmail-font-lock-keywords
;; These are all matched case-insensitively. ;; These are all matched case-insensitively.
;;(eval-when-compile (eval-when-compile
(let* ((cite-chars "[>|}]") (let* ((cite-chars "[>|}]")
(cite-prefix "a-z") (cite-prefix "a-z")
(cite-suffix (concat cite-prefix "0-9_.@-`'\""))) (cite-suffix (concat cite-prefix "0-9_.@-`'\"")))
(list '("^\\(From\\|Sender\\|Resent-From\\):" (list '("^\\(From\\|Sender\\|Resent-From\\):"
. 'rmail-header-name) . font-lock-function-name-face)
'("^Reply-To:.*$" . 'rmail-header-name) '("^Reply-To:.*$" . font-lock-function-name-face)
'("^Subject:" . 'rmail-header-name) '("^Subject:" . font-lock-comment-face)
'("^X-Spam-Status:" . 'rmail-header-name) '("^X-Spam-Status:" . font-lock-keyword-face)
'("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):" '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):"
. 'rmail-header-name) . font-lock-keyword-face)
;; Use MATCH-ANCHORED to effectively anchor the regexp left side. ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
`(,cite-chars `(,cite-chars
(,(concat "\\=[ \t]*" (,(concat "\\=[ \t]*"
@ -734,9 +721,8 @@ The first parenthesized expression should match the MIME-charset name.")
(1 font-lock-comment-delimiter-face nil t) (1 font-lock-comment-delimiter-face nil t)
(5 font-lock-comment-face nil t))) (5 font-lock-comment-face nil t)))
'("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$" '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$"
. 'rmail-header-name)))) . font-lock-string-face))))
;;) "Additional expressions to highlight in Rmail mode.")
;; "Additional expressions to highlight in Rmail mode.")
;; Perform BODY in the summary buffer ;; Perform BODY in the summary buffer
;; in such a way that its cursor is properly updated in its own window. ;; in such a way that its cursor is properly updated in its own window.