Fix bug: Rmail f copied the entire Rmail file into *mail*.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66336413e27643aee39effe184f995be4579bdaa..049c3d2e0e042717958c2736e73fe7944fd8b643 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-22  Richard Stallman  <rms@gnu.org>
+
+       * mail/rmailmm.el (rmail-insert-mime-forwarded-message):
+       Copy the buffer currently showing just one message.
+
 2011-06-22  Roland Winkler  <winkler@gnu.org>
 
        * textmodes/bibtex.el (bibtex-entry-update): Use mapc.

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 96132739b201696758e86d3d61cfb6a456da36d2..a02d388a6f77854816c14c0db454c22036a9ceb1 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1333,12 +1333,16 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
 (setq rmail-show-mime-function 'rmail-show-mime)
 
 (defun rmail-insert-mime-forwarded-message (forward-buffer)
-  "Function to set in `rmail-insert-mime-forwarded-message-function' (which see)."
-  (let ((rmail-mime-mbox-buffer
-        (with-current-buffer forward-buffer rmail-view-buffer)))
+  "Insert the message in FORWARD-BUFFER as a forwarded message.
+This is the usual value of `rmail-insert-mime-forwarded-message-function'."
+  (let ((message-buffer
+        (with-current-buffer forward-buffer
+          (if rmail-buffer-swapped
+              forward-buffer
+            rmail-view-buffer))))
     (save-restriction
       (narrow-to-region (point) (point))
-      (message-forward-make-body-mime rmail-mime-mbox-buffer))))
+      (message-forward-make-body-mime message-buffer))))
 
 (setq rmail-insert-mime-forwarded-message-function
       'rmail-insert-mime-forwarded-message)