(rmail-highlight-headers): Do nothing if

rmail-highlighted-headers is nil.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index df4e7d36a247d426dec57c23204f4be4a0fd41df..02e122d620dffeb254a6d0b7d69299075ff49f4d 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -69,7 +69,8 @@ It is useful to set this variable in the site customization file.")
 
 ;;;###autoload
 (defvar rmail-highlighted-headers "^From:\\|^Subject:" "\
-*Regexp to match Header fields that rmail should normally highlight.")
+*Regexp to match Header fields that rmail should normally highlight.
+A value of nil means don't highlight.")
 
 ;;;###autoload
 (defvar rmail-delete-after-output nil "\
@@ -1404,7 +1405,8 @@ If summary buffer is currently displayed, update current message there also."
 ;; Find all occurrences of certain fields, and highlight them.
 (defun rmail-highlight-headers ()
   ;; Do this only if the system supports faces.
-  (if (fboundp 'internal-find-face)
+  (if (and (fboundp 'internal-find-face)
+          rmail-highlighted-headers)
       (save-excursion
        (search-forward "\n\n" nil 'move)
        (save-restriction