(rmail-process-new-messages): Add an X-Coding-System header if one

doesn't exist.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 59bc26301b3b6d673779ae1d024b64b3bb0e4234..63989e11971ee81ed9d72c522287980368cb1227 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-17  Henrik Enberg  <enberg@printf.se>
+
+       * rmailkwd.el: Don't require rmail.
+
+       * rmail.el (rmail-process-new-messages): Don't require rmailkwd
+       here, do it at toplevel instead.
+       (rmail-process-new-messages): Add an X-Coding-System
+       header if one doesn't exist.
+
 2006-01-17  Alex Schroeder  <alex@gnu.org>
 
        * rmailsum.el (rmail-summary-by-labels): No longer concatenate

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e0bc137888201da7bfaae40e400554f9a4460d81..dea879addb17d1370e79b501e94fa7d9a1e3782f 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1944,7 +1944,8 @@ non-nil then do not show any progress messages."
         (case-fold-search nil)
        (new-message-counter 0)
        (start (point-max))
-       end attributes keywords message-descriptor-list date)
+       end attributes keywords message-descriptor-list
+       date coding)
     (or nomsg (message "Processing new messages..."))
     ;; Process each message in turn starting from the back and
     ;; proceeding to the front of the region.  This is especially a
@@ -1985,6 +1986,17 @@ non-nil then do not show any progress messages."
                    (delete-char 1)))
                (setq end (marker-position end-marker))
                (set-marker end-marker nil)))
+
+         ;; Add an X-Coding-System header if we don't have one.
+         (unless (rmail-header-get-header "X-Coding-System")
+           (let ((case-fold-search t))
+             (when (save-excursion
+                     (goto-char start)
+                     (search-forward "\n\n" nil t)
+                     (re-search-backward rmail-mime-charset-pattern start t))
+               (rmail-header-add-header "X-Coding-System"
+                                        (downcase (match-string 1))))))
+
          ;; Make sure we have an Rmail BABYL attribute header field.
          ;; All we can assume is that the Rmail BABYL header field is
          ;; in the header section.  It's placement can be modified by