Prompt in a more logical fashion when sending bug reports

* gnus/message.el (message-default-send-mail-function): Made into own
function for reuse by emacsbug.el.

* mail/emacsbug.el (report-emacs-bug-hook): Query the user first
about SMTP before checking the From header.

* mail/sendmail.el (sendmail-query-user-about-smtp): Refacored out
into own function for reuse by emacsbug.el.

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9305114b634..38b9139b7dd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-default-send-mail-function): Made into own
+        function for reuse by emacsbug.el.
+
 2012-02-09  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus.el (gnus-method-ephemeral-p): Move after declaration of defsubst
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5678acc5a2f..2d8bb36f94a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -655,14 +655,16 @@ Done before generating the new subject of a forward."
         (t
          (error "Don't know how to send mail.  Please customize `message-send-mail-function'"))))
 
-;; Useful to set in site-init.el
-(defcustom message-send-mail-function
+(defun message-default-send-mail-function ()
   (cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
         ((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
         ((eq send-mail-function 'sendmail-query-once) 'sendmail-query-once)
         ((eq send-mail-function 'mailclient-send-it)
          'message-send-mail-with-mailclient)
-        (t (message-send-mail-function)))
+        (t (message-send-mail-function))))
+
+;; Useful to set in site-init.el
+(defcustom message-send-mail-function (message-default-send-mail-function)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line whose contents match the
 variable `mail-header-separator'.