*** empty log message ***

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index fc1f12e0c349d1593d0dc1c6d74d93ede53fee9f..24ead4b731a80351ac571350893a31ac6029f5c0 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -8,6 +8,9 @@
        process messages in that region.
        (rmail-get-new-mail): Call `rmail-decode-region' before
        `rmail-process-new-messages'.
+       (rmail-fontify-message): Reformat, Doc String.
+       (rmail-ignored-headers): Generate with regexp-opt.
+       (rmail-displayed-headers): Default value set to nil.
 
 2006-01-21  Alex Schroeder  <alex@gnu.org>
 

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 19229eb4b6949669241d34beee9e023a0be23383..063b1df34ed58786658b5a5e44ea06d52c9d063e 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -263,21 +263,26 @@ It is useful to set this variable in the site customization file.")
 
 ;;;###autoload
 (defcustom rmail-ignored-headers
-  (concat "^via:\\|^mail-from:\\|^origin:\\|^references:\\|^sender:"
-         "\\|^status:\\|^received:\\|^content-transfer-encoding:"
-         "\\|^x400-\\(received\\|mts-identifier\\|content-type\\|originator\\|recipients\\):"
-         "\\|^list-\\(help\\|post\\|subscribe\\|id\\|unsubscribe\\|archive\\):"
-         "\\|^resent-\\(face\\|x.*\\|organization\\|openpgp\\|date\\|message-id\\):"
-         "\\|^thread-\\(topic\\|index\\)"
-         "\\|^summary-line:\\|^precedence:"
-         "\\|^path:\\|^face:\\|^delivered-to:\\|^lines:"
-         "\\|^return-path:\\|^errors-to:\\|^return-receipt-to:"
-         "\\|^content-\\(length\\|type\\|class\\|disposition\\):"
-         "\\|^nntp-posting-\\(host\\|date\\):\\|^user-agent"
-         "\\|^importance:\\|^envelope-to:\\|^delivery-date\\|^openpgp:"
-         "\\|^mbox-line:\\|^cancel-lock:\\|^in-reply-to:\\|^comment:"
-         "\\|^x-.*:\\|^domainkey-signature:\\|^mime-version:"
-         "\\|^original-recipient:\\|^from ")
+  (concat "^"
+         (regexp-opt '("via:" "mail-from:" "origin:" "references:" "sender:"
+                       "status:" "received:" "x400-content-type:"
+                       "x400-mts-identifier:" "x400-originator:"
+                       "x400-received:" "x400-recipients:" "list-archive:"
+                       "list-help:" "list-id:" "list-post:" "list-subscribe:"
+                       "list-unsubscribe:" "resent-date:" "resent-face:"
+                       "resent-message-id:" "resent-openpgp:"
+                       "resent-organization:" "resent-x.*:" "message-id:"
+                       "summary-line:" "precedence:" "path:" "face:"
+                       "delivered-to:" "lines:" "return-path:" "errors-to:"
+                       "return-receipt-to:" "content-length:" "content-type:"
+                       "content-class:" "content-disposition:"
+                       "content-transfer-encoding:" "nntp-posting-host:"
+                       "nntp-posting-date:" "user-agent:" "importance:"
+                       "envelope-to:" "delivery-date" "openpgp:" "mbox-line:"
+                       "cancel-lock:" "in-reply-to:" "comment:"
+                       "domainkey-signature:" "mime-version:"
+                       "original-recipient:" "x-.*:" "from ")
+                     "\\(?:"))
   "*Regexp to match header fields that Rmail should normally hide.
 \(See also `rmail-nonignored-headers', which overrides this regexp.)
 This variable is used for reformatting the message header,
@@ -304,8 +309,7 @@ go to that message and type \\[rmail-toggle-header] twice."
   :group 'rmail-headers)
 
 ;;;###autoload
-(defcustom rmail-displayed-headers "\
-^\\(to\\|from\\|sender\\|cc\\|date\\|subject\\|reply-to\\):[ \t]+"
+(defcustom rmail-displayed-headers nil
   "*Regexp to match Header fields that Rmail should display.
 If nil, display all header fields except those matched by
 `rmail-ignored-headers'."