(rmail-ignored-headers): Undo regexp-opt.

(rmail-inbox-alist): Add version tag.
(rmail-count-screen-lines): Doc string.
(rmail-process-new-messages): Use rmail-desc-default-attrs.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 24ead4b731a80351ac571350893a31ac6029f5c0..c53391f57ed0d4408cea3250a77b57e1c4813844 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-22  Henrik Enberg  <enberg@printf.se>
 
+       * rmaildesc.el (rmail-desc-default-attrs): New const.
+       (rmail-desc-get-default-attrs): Deleted.
+
        * rmail.el (rmail): Go back to using find-file for reading in the
        mail file.  This avoids gratuitous modification of the file.
        (rmail-decode-region): Doc string, cleanup.
@@ -9,8 +12,10 @@
        (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.
+       (rmail-inbox-alist): Add version tag.
+       (rmail-count-screen-lines): Doc string.
+       (rmail-process-new-messages): Use rmail-desc-default-attrs.
 
 2006-01-21  Alex Schroeder  <alex@gnu.org>
 

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 063b1df34ed58786658b5a5e44ea06d52c9d063e..f8e7fda82a7aa52056f7fff100730938dd652cf2 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -263,26 +263,21 @@ It is useful to set this variable in the site customization file.")
 
 ;;;###autoload
 (defcustom rmail-ignored-headers
-  (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 ")
-                     "\\(?:"))
+  (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:\\|^message-id:"
+         "\\|^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 ")
   "*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,
@@ -373,7 +368,8 @@ Example setting if procmail delivers all your spam to
 \(setq rmail-inbox-alist '((\"~/Mail/SPAM\" \"~/Mail/SPAM.in\")))"
   :type '(alist :key-type file :value-type (repeat file))
   :group 'rmail-retrieve
-  :group 'rmail-files)
+  :group 'rmail-files
+  :version "22.1")
 
 ;;;###autoload
 (defcustom rmail-mail-new-frame nil
@@ -1900,8 +1896,8 @@ otherwise, show it in full."
     (goto-char start)))
 
 ;; Lifted from repos-count-screen-lines.
-;; Return number of screen lines between START and END.
 (defun rmail-count-screen-lines (start end)
+  "Return number of screen lines between START and END."
   (save-excursion
     (save-restriction
       (narrow-to-region start end)
@@ -2036,7 +2032,7 @@ non-nil then do not show any progress messages."
          (unless attributes
            ;; No suitable header exists.  Append the default BABYL
            ;; data header for a new message.
-           (setq attributes (rmail-desc-get-default-attrs))
+           (setq attributes rmail-desc-default-attrs)
            (rmail-header-add-header rmail-header-attribute-header attributes))
           ;; Set up keywords, if any.  The keywords are provided via a
           ;; comma separated list and returned as a list of strings.