2 files changed, 6 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5dcbd8f5ce0..56172cb6317 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
 
+        * message.el (message-forward-make-body-digest-plain)
+        (message-followup, message-reply): Clean up things noted by Stefan.
+
         * gnus-art.el (gnus-article-setup-buffer): Stop the date timer if
         gnus-article-update-date-headers is nil.
         (gnus-article-date-headers): Rip out the old -treat-date-* stuff, since
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1f67d76e5fb..689a008a3e8 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4345,7 +4345,6 @@ This function could be useful in `message-setup-hook'."
         (tembuf (message-generate-new-buffer-clone-locals " message temp"))
         (curbuf (current-buffer))
         (id (message-make-message-id)) (n 1)
-        required-mail-headers           ;FIXME: Unused, right?  --Stef
         plist total header)
     (while (not (eobp))
       (if (< (point-max) (+ p message-send-mail-partially-limit))
@@ -6776,7 +6775,6 @@ Useful functions to put in this list include:
   (require 'gnus-sum)                   ; for gnus-list-identifiers
   (let ((cur (current-buffer))
         from subject date
-        reply-to to cc               ;FIXME: These 3 seem to be unused?  --Stef
         references message-id follow-to
         (inhibit-point-motion-hooks t)
         (message-this-is-mail t)
@@ -7297,11 +7295,9 @@ Optional DIGEST will use digest to forward."
 (defun message-forward-make-body-digest-plain (forward-buffer)
   (insert
    "\n-------------------- Start of forwarded message --------------------\n")
-  (let ((b (point)) e)                  ;FIXME: Not used, right?  --Stef
-    (mml-insert-buffer forward-buffer)
-    (setq e (point))
-    (insert
-     "\n-------------------- End of forwarded message --------------------\n")))
+  (mml-insert-buffer forward-buffer)
+  (insert
+   "\n-------------------- End of forwarded message --------------------\n"))
 
 (defun message-forward-make-body-digest-mime (forward-buffer)
   (insert "\n<#multipart type=digest>\n")