(rmail-fontify-message): Reformat, Doc String.

(rmail-ignored-headers): Generate with regexp-opt.
(rmail-displayed-headers): Default value set to nil.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 275119bce9ecd26e80ca1973bcb3507a2935c21b..19229eb4b6949669241d34beee9e023a0be23383 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3241,17 +3241,18 @@ This has an effect only if a summary buffer exists."
       (and (not modified) (buffer-modified-p) (set-buffer-modified-p nil)))))
 
 (defun rmail-fontify-message ()
-  ;; Fontify the current message if it is not already fontified.
-  (if (text-property-any (point-min) (point-max) 'rmail-fontified nil)
-      (let ((modified (buffer-modified-p))
-           (buffer-undo-list t) (inhibit-read-only t)
-           before-change-functions after-change-functions
-           buffer-file-name buffer-file-truename)
-       (save-excursion
-         (save-match-data
-           (add-text-properties (point-min) (point-max) '(rmail-fontified t))
-           (font-lock-fontify-region (point-min) (point-max))
-           (and (not modified) (buffer-modified-p) (set-buffer-modified-p nil)))))))
+  "Fontify the current message if it is not already fontified."
+  (when (text-property-any (point-min) (point-max) 'rmail-fontified nil)
+    (let ((modified (buffer-modified-p))
+         (buffer-undo-list t) (inhibit-read-only t)
+         before-change-functions after-change-functions
+         buffer-file-name buffer-file-truename)
+      (save-excursion
+       (save-match-data
+         (add-text-properties (point-min) (point-max) '(rmail-fontified t))
+         (font-lock-fontify-region (point-min) (point-max))
+         (and (not modified) (buffer-modified-p)
+              (set-buffer-modified-p nil)))))))
 \f
 ;;; Speedbar support for RMAIL files.
 (eval-when-compile (require 'speedbar))