* message.el (message-forward-rmail-make-body): Directly use

rmail-msg-restore-non-pruned-header to avoid calling
vertical-motion.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 20fc14ba42ef5e08bf0dfa8ce9943434653a1b2c..1d0d58680711b785d755edacb57c576c16d48f50 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-forward-rmail-make-body): Directly use
+       rmail-msg-restore-non-pruned-header to avoid calling
+       vertical-motion.
+
 2002-01-27  Richard M. Stallman  <rms@gnu.org>
 
        * time-date.el: Add autoload cookies.  Many doc fixes.
@@ -5,17 +11,20 @@
        (time-subtract): Renamed from subtract-time.
        (subtract-time): New alias for time-subtract.
        
-2002-01-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       
+2002-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
        * gnus-start.el (gnus-read-init-file): Cleaned up.
+
+2002-01-03  Dave Love  <d.love@dl.ac.uk>
+
        * gnus-start.el (gnus-startup-file-coding-system): Removed.
        (gnus-read-init-file): Don't use it.
-       * gnus-start.el (gnus-read-init-file): Don't force coding system
-       for ~/.gnus.  
-       From Lars Magne Ingebrigtsen  <larsi@gnus.org>
-       From Dave Love <fx@gnu.org>
-       From Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
+2002-01-03  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-start.el (gnus-read-init-file): Don't force coding system
+       for ~/.gnus.  From Dave Love <fx@gnu.org>.
+       
 2002-01-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-charset-to-coding-system): Don't setq charset.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c6eac7c9aebd2f521b079b9a4356d94f8f95f674..f0401d08f42df9c496f10167c933010eaa145dbd 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4288,8 +4288,8 @@ Optional DIGEST will use digest to forward."
 (defun message-forward-rmail-make-body (forward-buffer)
   (save-window-excursion
     (set-buffer forward-buffer)
-    (let (rmail-enable-mime)
-      (rmail-toggle-header 0)))
+    (if (rmail-msg-is-pruned)
+       (rmail-msg-restore-non-pruned-header)))
   (message-forward-make-body forward-buffer))
 
 ;;;###autoload