Fix bug that f in Rmail, in some situations, would insert entire Rmail file.

4 files changed, 25 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5721ac24150..f39727164b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-13  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Get
+        current message boundaries and pass them to
+        message-forward-make-body-mime.  Minor style changes.
+
 2013-01-13  Eli Zaretskii  <eliz@gnu.org>
 
         * cus-start.el (all): Avoid warnings about
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 44dbf060e49..f796f2d5558 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-13  Richard Stallman  <rms@gnu.org>
+
+        * message.el (message-forward-make-body-mime): New args BEG, END
+        specify what part of FORWARD-BUFFER to use.  Do the work directly
+        instead of calling `mml-insert-buffer'.
+
 2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
 
         * gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
@@ -37,6 +43,7 @@
         (mml-smime-epg-find-usable-secret-key): New helper function copied from
         mml2015.el.
 
+>>>>>>> MERGE-SOURCE
 2012-12-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8832899c55d..808e1edd6c3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7376,12 +7376,13 @@ Optional DIGEST will use digest to forward."
         (dolist (elem ignored)
           (message-remove-header elem t))))))
 
-(defun message-forward-make-body-mime (forward-buffer)
+(defun message-forward-make-body-mime (forward-buffer &optional beg end)
   (let ((b (point)))
     (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")
     (save-restriction
       (narrow-to-region (point) (point))
-      (mml-insert-buffer forward-buffer)
+      (insert-buffer-substring forward-buffer beg end)
+      (mml-quote-region (point-min) (point-max))
       (goto-char (point-min))
       (when (looking-at "From ")
         (replace-match "X-From-Line: "))
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 566dec1ad39..350e3dacbcf 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1365,14 +1365,15 @@ The arguments ARG and STATE have no effect in this case."
 (defun rmail-insert-mime-forwarded-message (forward-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
-               rmail-view-buffer
-             forward-buffer))))
-    (save-restriction
-      (narrow-to-region (point) (point))
-      (message-forward-make-body-mime message-buffer))))
+  (let (contents-buffer start end)
+    (with-current-buffer forward-buffer
+      (setq contents-buffer
+            (if rmail-buffer-swapped
+                rmail-view-buffer
+              forward-buffer)
+            start (rmail-msgbeg rmail-current-message)
+            end (rmail-msgend rmail-current-message)))
+    (message-forward-make-body-mime contents-buffer start end)))
 
 (setq rmail-insert-mime-forwarded-message-function
       'rmail-insert-mime-forwarded-message)