[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111178: * rmailmm.el (rmail-insert-mime-forwarded-message): Revert 2012-12-29 change

[Glenn Morris]

------------------------------------------------------------
revno: 111178
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-01-15 20:44:11 -0500
message:
  * 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)
modified:
  lisp/ChangeLog
  lisp/mail/rmailmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-10 03:44:12 +0000
+++ b/lisp/ChangeLog    2013-01-16 01:44:11 +0000
@@ -1,3 +1,9 @@
+2013-01-16  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/python.el (python-nav-end-of-statement): Fix

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2013-01-01 09:11:05 +0000
+++ b/lisp/mail/rmailmm.el      2013-01-16 01:44:11 +0000
@@ -1368,8 +1368,8 @@
   (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))))