Mercurial > emacs
comparison lisp/mail/rmail.el @ 91796:132b386a2c8b
Reverted wrong changes to rmail.el.
author | Bastien Guerry <bzg@altern.org> |
---|---|
date | Tue, 12 Feb 2008 07:13:29 +0000 |
parents | bfe257ff864c |
children | f0b22bbb77fb |
comparison
equal
deleted
inserted
replaced
91795:bfe257ff864c | 91796:132b386a2c8b |
---|---|
339 :version "22.1") | 339 :version "22.1") |
340 | 340 |
341 ;;;###autoload | 341 ;;;###autoload |
342 (defcustom rmail-highlight-face 'rmail-highlight "\ | 342 (defcustom rmail-highlight-face 'rmail-highlight "\ |
343 *Face used by Rmail for highlighting headers." | 343 *Face used by Rmail for highlighting headers." |
344 :type '(choice (const :tag "Default" nil) | |
345 face) | |
346 :group 'rmail-headers) | |
347 | |
348 (defface rmail-header-name | |
349 '((t (:inherit font-lock-function-name-face))) | |
350 "Face to use for highlighting the header names." | |
351 :group 'rmail-headers | |
352 :version "23.1") | |
353 | |
354 ;;;###autoload | |
355 (defcustom rmail-header-name-face 'rmail-header-name "\ | |
356 *Face to use for highlighting the header names." | |
357 :type '(choice (const :tag "Default" nil) | 344 :type '(choice (const :tag "Default" nil) |
358 face) | 345 face) |
359 :group 'rmail-headers) | 346 :group 'rmail-headers) |
360 | 347 |
361 ;;;###autoload | 348 ;;;###autoload |
709 "\\(remote from .*\\)?" | 696 "\\(remote from .*\\)?" |
710 | 697 |
711 "\n")) | 698 "\n")) |
712 nil) | 699 nil) |
713 | 700 |
714 (setq rmail-font-lock-keywords | 701 (defvar rmail-font-lock-keywords |
715 ;; These are all matched case-insensitively. | 702 ;; These are all matched case-insensitively. |
716 ;;(eval-when-compile | 703 (eval-when-compile |
717 (let* ((cite-chars "[>|}]") | 704 (let* ((cite-chars "[>|}]") |
718 (cite-prefix "a-z") | 705 (cite-prefix "a-z") |
719 (cite-suffix (concat cite-prefix "0-9_.@-`'\""))) | 706 (cite-suffix (concat cite-prefix "0-9_.@-`'\""))) |
720 (list '("^\\(From\\|Sender\\|Resent-From\\):" | 707 (list '("^\\(From\\|Sender\\|Resent-From\\):" |
721 . 'rmail-header-name) | 708 . font-lock-function-name-face) |
722 '("^Reply-To:.*$" . 'rmail-header-name) | 709 '("^Reply-To:.*$" . font-lock-function-name-face) |
723 '("^Subject:" . 'rmail-header-name) | 710 '("^Subject:" . font-lock-comment-face) |
724 '("^X-Spam-Status:" . 'rmail-header-name) | 711 '("^X-Spam-Status:" . font-lock-keyword-face) |
725 '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):" | 712 '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):" |
726 . 'rmail-header-name) | 713 . font-lock-keyword-face) |
727 ;; Use MATCH-ANCHORED to effectively anchor the regexp left side. | 714 ;; Use MATCH-ANCHORED to effectively anchor the regexp left side. |
728 `(,cite-chars | 715 `(,cite-chars |
729 (,(concat "\\=[ \t]*" | 716 (,(concat "\\=[ \t]*" |
730 "\\(\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?" | 717 "\\(\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?" |
731 "\\(" cite-chars "[ \t]*\\)\\)+\\)" | 718 "\\(" cite-chars "[ \t]*\\)\\)+\\)" |
732 "\\(.*\\)") | 719 "\\(.*\\)") |
733 (beginning-of-line) (end-of-line) | 720 (beginning-of-line) (end-of-line) |
734 (1 font-lock-comment-delimiter-face nil t) | 721 (1 font-lock-comment-delimiter-face nil t) |
735 (5 font-lock-comment-face nil t))) | 722 (5 font-lock-comment-face nil t))) |
736 '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$" | 723 '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$" |
737 . 'rmail-header-name)))) | 724 . font-lock-string-face)))) |
738 ;;) | 725 "Additional expressions to highlight in Rmail mode.") |
739 ;; "Additional expressions to highlight in Rmail mode.") | |
740 | 726 |
741 ;; Perform BODY in the summary buffer | 727 ;; Perform BODY in the summary buffer |
742 ;; in such a way that its cursor is properly updated in its own window. | 728 ;; in such a way that its cursor is properly updated in its own window. |
743 (defmacro rmail-select-summary (&rest body) | 729 (defmacro rmail-select-summary (&rest body) |
744 `(let ((total rmail-total-messages)) | 730 `(let ((total rmail-total-messages)) |