Further `sendmail-query-once' cleanups for sending bug reports

* mail/emacsbug.el (report-emacs-bug-hook): Look at the value of
`message-default-send-mail-function' and not `send-mail-function'
when doing the prompting for `sendmail-query-once' before sending
in Message buffers.

Fixes: debbugs:10897

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd46500..c9c12a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail/emacsbug.el (report-emacs-bug-hook): Look at the value of
+       `message-default-send-mail-function' and not `send-mail-function'
+       when doing the prompting for `sendmail-query-once' before sending
+       in Message buffers (bug#10897).
+
 2012-03-02  Alan Mackenzie  <acm@muc.de>
 
        Depessimize the handling of very large macros.

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 50fcfce..aa98da8 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -394,7 +394,11 @@ and send the mail again%s."
     ;; Query the user for the SMTP method, so that we can skip
     ;; questions about From header validity if the user is going to
     ;; use mailclient, anyway.
-    (when (eq send-mail-function 'sendmail-query-once)
+    (when (or (and (derived-mode-p 'message-mode)
+                  (eq (message-default-send-mail-function)
+                      'sendmail-query-once))
+             (and (not (derived-mode-p 'message-mode))
+                  (eq send-mail-function 'sendmail-query-once)))
       (sendmail-query-user-about-smtp)
       (when (derived-mode-p 'message-mode)
        (setq message-send-mail-function (message-default-send-mail-function))))