* rmailmm.el (rmail-insert-mime-forwarded-message): Revert 2012-12-29 change

 Ref:
<http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00360.html>

(Do not merge to trunk)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63dd9d0..efc9521 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-16  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmailmm.el (rmail-insert-mime-forwarded-message):
+       Revert 2012-12-29 change.  Ref:
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00360.html>
+
 2013-01-10  Fabián Ezequiel Gallina  <fgallina@cuca>
 
        * progmodes/python.el (python-nav-end-of-statement): Fix

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 566dec1..71590f5 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1368,8 +1368,8 @@ 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))))
+              forward-buffer
+            rmail-view-buffer))))
     (save-restriction
       (narrow-to-region (point) (point))
       (message-forward-make-body-mime message-buffer))))