From 7a70468fb18a3e54f3ae026143d01ac4ca0fcac2 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 22 Jun 2011 19:35:21 -0400 Subject: [PATCH] Fix bug: Rmail f copied the entire Rmail file into *mail*. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmailmm.el | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66336413e27..049c3d2e0e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-22 Richard Stallman + + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): + Copy the buffer currently showing just one message. + 2011-06-22 Roland Winkler * textmodes/bibtex.el (bibtex-entry-update): Use mapc. diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 96132739b20..a02d388a6f7 100644 --- 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) -- 2.39.2