2000-12-21 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mml.el (gnus-add-minor-mode): Autoload.

	* message.el (message-forward): Save-restriction.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf1c854..dac9e1c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-21 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml.el (gnus-add-minor-mode): Autoload.
+
+       * message.el (message-forward): Save-restriction.
+
 2000-12-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-art.el (article-treat-dumbquotes): More doc, provided by

diff --git a/lisp/message.el b/lisp/message.el
index 093899f..ec5def1 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4330,7 +4330,8 @@ Optional DIGEST will use digest to forward."
                (set-buffer cur)
                (mm-with-unibyte-current-buffer
                  (set-buffer tmp)
-                 (insert-buffer-substring cur))
+                 (insert-buffer-substring cur)
+                 (set-buffer cur))
                (set-buffer tmp)
                (mm-enable-multibyte)
                (mime-to-mml)
@@ -4339,13 +4340,14 @@ Optional DIGEST will use digest to forward."
                  (replace-match "X-From-Line: "))
                (set-buffer target)
                (insert-buffer-substring tmp)
-               (set-buffer tmp))
-             (goto-char (point-max)))
-         (mml-insert-buffer cur)
-         (goto-char (point-min))
-         (when (looking-at "From ")
-           (replace-match "X-From-Line: "))
-         (goto-char (point-max))))
+               (set-buffer tmp)))
+         (save-restriction
+           (narrow-to-region (point) (point))
+           (mml-insert-buffer cur)
+           (goto-char (point-min))
+           (when (looking-at "From ")
+             (replace-match "X-From-Line: "))
+           (goto-char (point-max)))))
       (setq e (point))
       (if message-forward-as-mime
          (if digest

diff --git a/lisp/mml.el b/lisp/mml.el
index 6af6b1d..e406c10 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -33,6 +33,7 @@
 (eval-and-compile
   (autoload 'message-make-message-id "message")
   (autoload 'gnus-setup-posting-charset "gnus-msg")
+  (autoload 'gnus-add-minor-mode "gnus-ems")
   (autoload 'message-fetch-field "message")
   (autoload 'message-posting-charset "message"))