(rmail-process-new-messages): Don't decode messages here.

(rmail-decode-messages): New function.
(rmail): Use it.
(rmail-get-new-mail): Likewise.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index ea59ecc1bead25d6f430d2dfe79db6e4cd487313..03f876f12635d96e515bfa8d2bd72e1c5919cf1d 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-21  Henrik Enberg  <enberg@printf.se>
+
+       * rmail.el (rmail-process-new-messages): Don't decode messages
+       here, Don't lose on missing subject field.
+       (rmail-decode-messages): New function.
+       (rmail): Use it.
+       (rmail-get-new-mail): Likewise.
+
+       * rmailsum.el (rmail-summary-get-sender): Narrow to current
+       message before extracting headers.
+
 2006-01-21  Alex Schroeder  <alex@gnu.org>
 
        * rmailedit.el (rmail-abort-edit): Don't call

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 50df9d6aa171ef3d0313cfffb31bb75676c60335..030004b06bc7aab95d0f1f45aff4326cf524fccb 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -841,7 +841,10 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
                  (insert-file-contents-literally new-file))
                (message "Replacing BABYL format with mbox format...done"))
            (delete-file old-file)
-           (delete-file new-file))))
+           (delete-file new-file)))
+       ;; Go through the converted file and decode each message
+       ;; according to its mime charset.
+       (rmail-decode-messages))
       (goto-char (point-max))
       (rmail-mode-2)
       ;; setup files coding system
@@ -1455,6 +1458,9 @@ updated file.  It returns t if it got any new messages."
                        rmail-current-message (1+ rmail-total-messages)
                        rmail-total-messages (rmail-desc-get-count))
                  (run-hooks 'rmail-get-new-mail-hook)
+                 ;; Go through the RMAIL file and decode each message
+                 ;; according to its mime charset.
+                 (rmail-decode-messages)
                  (save-buffer))
                ;; Delete the old files, now that the RMAIL file is
                ;; saved.
@@ -1713,6 +1719,43 @@ is non-nil if the user has supplied the password interactively.
       (setq buffer-file-coding-system nil)
       (setq save-buffer-coding-system (or coding-system 'undecided)))))
 
+(defun rmail-decode-messages ()
+  (let ((inhibit-read-only t)
+        (case-fold-search nil)
+       (start (point-max))
+       end)
+    ;; Process each message in turn starting from the back and
+    ;; proceeding to the front of the region.  This is especially a good
+    ;; approach since the buffer will likely have new headers added.
+    (widen)
+    (goto-char start)
+    (while (re-search-backward rmail-unix-mail-delimiter nil t)
+      (setq end start)
+      (setq start (point))
+      (save-excursion
+       (save-restriction
+         (narrow-to-region start end)
+         (goto-char (point-min))
+
+         (setq last-coding-system-used nil)
+         (or rmail-enable-mime
+             (not rmail-enable-multibyte)
+             (let ((mime-charset
+                    (when (and rmail-decode-mime-charset
+                               (save-excursion
+                                 (goto-char (rmail-header-get-limit))
+                                 (let ((case-fold-search t))
+                                   (re-search-backward
+                                    rmail-mime-charset-pattern
+                                    (point-min) t))))
+                      (intern (downcase (match-string 1))))))
+               (rmail-decode-region start (point) mime-charset)))
+
+         ;; Add an the X-Coding-System header.
+         (unless (rmail-header-get-header "X-Coding-System")
+           (let ((val (symbol-name last-coding-system-used)))
+             (rmail-header-add-header "X-Coding-System" val))))))))
+
 \f
 ;;;; *** Rmail Message Formatting and Header Manipulation ***
 
@@ -1934,26 +1977,6 @@ non-nil then do not show any progress messages."
                (setq end (marker-position end-marker))
                (set-marker end-marker nil)))
 
-         ;; Decode Message according to charset.
-         (setq last-coding-system-used nil)
-         (or rmail-enable-mime
-             (not rmail-enable-multibyte)
-             (let ((mime-charset
-                    (when (and rmail-decode-mime-charset
-                               (save-excursion
-                                 (goto-char (rmail-header-get-limit))
-                                 (let ((case-fold-search t))
-                                   (re-search-backward
-                                    rmail-mime-charset-pattern
-                                    (point-min) t))))
-                        (intern (downcase (match-string 1))))))
-               (rmail-decode-region start (point) mime-charset)))
-
-         ;; Add an X-Coding-System header if we don't have one.
-         (unless (rmail-header-get-header "X-Coding-System")
-           (rmail-header-add-header "X-Coding-System"
-                                    (symbol-name last-coding-system-used)))
-
          ;; 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