2 files changed, 36 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd205450369..d0457265500 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2009-02-07  Alex Schroeder  <alex@gnu.org>
+
+        * mail/unrmail.el (unrmail): Use regexps to find message separators so
+        as not to match any fake rmime.el separators.  Remove any sections added
+        by rmime.el.
+
+2009-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * mail/metamail.el (metamail-interpret-body): Remove Rmail-specific hack
+        that is no longer appropriate to mbox Rmail.
+
+        * mail/rmailsum.el (rmail-create-summary-line): Widen the view buffer
+        before trying to move to the start of the message.
+        (rmail-summary-undelete-many, rmail-summary-rmail-update):
+        Fix rmail-set-attribute calls.
+
+        * mail/sendmail.el (mail-bury-selects-summary, mail-yank-original):
+        Doc fix.
+        (rmail-output-to-rmail-buffer): Autoload it.
+        (mail-do-fcc): Give it a doc string.  Update for mbox Rmail, simplify.
+
 2009-02-06  Glenn Morris  <rgm@gnu.org>
 
         * mail/unrmail.el (unrmail): Use current-time-string.
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index db2b5acf5f9..497fe73e3dc 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -121,11 +121,21 @@ Its header part is not interpreted at all."
              (append metamail-switches
                      (list "-b" "-c" contype "-E" encoding))))
         (metamail-region end (point-max) viewmode nil nodisplay))
-      ;; Mode specific hack.
-      (cond ((eq major-mode 'rmail-mode)
-             ;; Adjust the marker of this message if in Rmail mode buffer.
-             (set-marker (aref rmail-message-vector (1+ rmail-current-message))
-                         (point-max))))
+      ;; This mode specific hack is no longer appropriate in mbox Rmail.
+      ;; Pre-mbox, we have just modified the actual folder, so we
+      ;; update the message-vector with the new end position of the
+      ;; current message.  In mbox Rmail, all we have done is modify a
+      ;; display copy of the message.  Note also that point-max is a
+      ;; marker in the wrong buffer: the message-vector contains
+      ;; markers in rmail-view-buffer (which is not in rmail-mode).
+      ;; So this hack actually breaks the message-vector.
+      ;; If you're calling this on the actual rmail-view-buffer (or a
+      ;; non-swapped rmail-buffer), you would still need this hack.
+      ;; But you're not going to do that.
+;;;      (cond ((eq major-mode 'rmail-mode)
+;;;          ;; Adjust the marker of this message if in Rmail mode buffer.
+;;;          (set-marker (aref rmail-message-vector (1+ rmail-current-message))
+;;;                      (point-max))))
       )))
 
 ;;;###autoload