Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1564

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b21bad4..d0a9a72 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-03  Brian Sniffen  <bts@evenmere.org>  (tiny change)
+
+       * gnus-draft.el (gnus-draft-send): Bind gnus-message-setup-hook to nil
+       when sending a queued message to avoid extra mml tags.
+
 2009-03-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mml.el (mml-insert-mime): Don't break parts that mm-uu dissected.

diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 9e051a9..0c94d0b 100644 (file)
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -146,6 +146,8 @@ Obeys the standard process/prefix convention."
                                  message-send-hook))
          (message-setup-hook (and (not is-queue)
                                   message-setup-hook))
+        (gnus-message-setup-hook (and (not is-queue)
+                                      gnus-message-setup-hook))
         (message-signature (and (not is-queue)
                                 message-signature))
          (gnus-agent-queue-mail (and (not is-queue)