summaryrefslogtreecommitdiff
path: root/lisp/mail/emacsbug.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2012-03-03 15:43:03 +0100
committerLars Magne Ingebrigtsen <larsi@gnus.org>2012-03-03 15:43:03 +0100
commitfbae463706f1a5e3bce206b65c7341d60a43c268 (patch)
tree6e3a5275bda8de348c44690c04e27c2d156370a9 /lisp/mail/emacsbug.el
parent01a6dcc8832ba195ca2c17d5cf04b58f3736902b (diff)
downloademacs-fbae463706f1a5e3bce206b65c7341d60a43c268.tar.gz
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
Diffstat (limited to 'lisp/mail/emacsbug.el')
-rw-r--r--lisp/mail/emacsbug.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 50fcfceee35..aa98da87904 100644
--- 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))))