[Emacs-diffs] /srv/bzr/emacs/trunk r104680: Fix bug: Rmail f copied the entire Rmail file into *mail*.

[Richard Stallman]

------------------------------------------------------------
revno: 104680
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-22 19:35:21 -0400
message:
  Fix bug: Rmail f copied the entire Rmail file into *mail*.
modified:
  lisp/ChangeLog
  lisp/mail/rmailmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-22 20:59:48 +0000
+++ b/lisp/ChangeLog    2011-06-22 23:35:21 +0000
@@ -1,3 +1,8 @@
+2011-06-22  Richard Stallman  <address@hidden>
+
+       * mail/rmailmm.el (rmail-insert-mime-forwarded-message):
+       Copy the buffer currently showing just one message.
+
 2011-06-22  Roland Winkler  <address@hidden>
 
        * textmodes/bibtex.el (bibtex-entry-update): Use mapc.

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2011-02-23 04:19:28 +0000
+++ b/lisp/mail/rmailmm.el      2011-06-22 23:35:21 +0000
@@ -1333,12 +1333,16 @@
 (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)