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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52b9eb383744a96f6c1758073966661e9b270a56..c28dc491863681b675f77c53c1d6e9d1b14d5c94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * 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.
+
 2012-02-10  Leo Liu  <sdl.web@gmail.com>
 
        * subr.el (condition-case-unless-debug): Rename from

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9305114b6346e0661a5b6af94c3df3485a0ce1b3..38b9139b7dd0c012ea2939e1365330ad24a9bb15 100644 (file)
--- 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 5678acc5a2f157b50925683735470fb6515307be..2d8bb36f94a5b9518a78a074445882398f48d4c8 100644 (file)
--- 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'.

diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 20b436172baaff494a9e7a87a53423a075ba76e7..50fcfceee35f280c537c49ddcb0184eafe653209 100644 (file)
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'sendmail)
+(require 'message)
+
 (defgroup emacsbug nil
   "Sending Emacs bug reports."
   :group 'maint
@@ -365,26 +368,7 @@ usually do not have translators for other languages.\n\n")))
          (string-equal (buffer-substring-no-properties (point-min) (point))
                        report-emacs-bug-orig-text)
          (error "No text entered in bug report"))
-    (or report-emacs-bug-no-confirmation
-       ;; mailclient.el does not handle From (at present).
-       (if (derived-mode-p 'message-mode)
-           (eq message-send-mail-function 'message-send-mail-with-mailclient)
-         (eq send-mail-function 'mailclient-send-it))
-       ;; Not narrowing to the headers, but that's OK.
-       (let ((from (mail-fetch-field "From")))
-         (and (or (not from)
-                  (message-bogus-recipient-p from)
-                  ;; This is the default user-mail-address.  On today's
-                  ;; systems, it seems more likely to be wrong than right,
-                  ;; since most people don't run their own mail server.
-                  (string-match (format "\\<%s@%s\\>"
-                                        (regexp-quote (user-login-name))
-                                        (regexp-quote (system-name)))
-                                from))
-              (not (yes-or-no-p
-                    (format "Is `%s' really your email address? " from)))
-              (error "Please edit the From address and try again"))))
-    ;; The last warning for novice users.
+    ;; Warning for novice users.
     (unless (or report-emacs-bug-no-confirmation
                (yes-or-no-p
                 "Send this bug report to the Emacs maintainers? "))
@@ -407,7 +391,32 @@ and send the mail again%s."
                                     report-emacs-bug-send-command)
                           "")))))
       (error "M-x report-emacs-bug was cancelled, please read *Bug Help* buffer"))
-
+    ;; 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)
+      (sendmail-query-user-about-smtp)
+      (when (derived-mode-p 'message-mode)
+       (setq message-send-mail-function (message-default-send-mail-function))))
+    (or report-emacs-bug-no-confirmation
+       ;; mailclient.el does not need a valid From
+       (if (derived-mode-p 'message-mode)
+           (eq message-send-mail-function 'message-send-mail-with-mailclient)
+         (eq send-mail-function 'mailclient-send-it))
+       ;; Not narrowing to the headers, but that's OK.
+       (let ((from (mail-fetch-field "From")))
+         (and (or (not from)
+                  (message-bogus-recipient-p from)
+                  ;; This is the default user-mail-address.  On today's
+                  ;; systems, it seems more likely to be wrong than right,
+                  ;; since most people don't run their own mail server.
+                  (string-match (format "\\<%s@%s\\>"
+                                        (regexp-quote (user-login-name))
+                                        (regexp-quote (system-name)))
+                                from))
+              (not (yes-or-no-p
+                    (format "Is `%s' really your email address? " from)))
+              (error "Please edit the From address and try again"))))
     ;; Delete the uninteresting text that was just to help fill out the report.
     (rfc822-goto-eoh)
     (forward-line 1)

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 18d928e4b908f88b3a6792c5bda6b1d62f96da7b..91e0b183a688a4a1e16016f4268478ff4f34ddb0 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -513,48 +513,51 @@ This also saves the value of `send-mail-function' via Customize."
   ;; a second time, probably because someone's using an old value
   ;; of send-mail-function.
   (when (eq send-mail-function 'sendmail-query-once)
-    (let* ((options `(("mail client" . mailclient-send-it)
-                      ,@(when (and sendmail-program
-                                   (executable-find sendmail-program))
-                          '(("transport" . sendmail-send-it)))
-                      ("smtp" . smtpmail-send-it)))
-           (choice
-            ;; Query the user.
-            (with-temp-buffer
-              (rename-buffer "*Emacs Mail Setup Help*" t)
-              (insert "\
+    (sendmail-query-user-about-smtp))
+  (funcall send-mail-function))
+
+(defun sendmail-query-user-about-smtp ()
+  (let* ((options `(("mail client" . mailclient-send-it)
+                   ,@(when (and sendmail-program
+                                (executable-find sendmail-program))
+                       '(("transport" . sendmail-send-it)))
+                   ("smtp" . smtpmail-send-it)))
+        (choice
+         ;; Query the user.
+         (with-temp-buffer
+           (rename-buffer "*Emacs Mail Setup Help*" t)
+           (insert "\
  Emacs is about to send an email message, but it has not been
  configured for sending email.  To tell Emacs how to send email:
 
  - Type `"
-                     (propertize "mail client" 'face 'bold)
-                     "' to start your default email client and
+                   (propertize "mail client" 'face 'bold)
+                   "' to start your default email client and
    pass it the message text.\n\n")
-             (and sendmail-program
-                  (executable-find sendmail-program)
-                  (insert "\
+           (and sendmail-program
+                (executable-find sendmail-program)
+                (insert "\
  - Type `"
-                          (propertize "transport" 'face 'bold)
-                          "' to invoke the system's mail transport agent
+                        (propertize "transport" 'face 'bold)
+                        "' to invoke the system's mail transport agent
    (the `"
-                          sendmail-program
-                          "' program).\n\n"))
-             (insert "\
+                        sendmail-program
+                        "' program).\n\n"))
+           (insert "\
  - Type `"
-                     (propertize "smtp" 'face 'bold)
-                     "' to send mail directly to an \"outgoing mail\" server.
+                   (propertize "smtp" 'face 'bold)
+                   "' to send mail directly to an \"outgoing mail\" server.
    (Emacs may prompt you for SMTP settings).
 
  Emacs will record your selection and will use it thereafter.
  To change it later, customize the option `send-mail-function'.\n")
-              (goto-char (point-min))
-              (display-buffer (current-buffer))
-              (let ((completion-ignore-case t))
-                (completing-read "Send mail via: "
-                                 options nil 'require-match)))))
-      (customize-save-variable 'send-mail-function
-                               (cdr (assoc-string choice options t)))))
-  (funcall send-mail-function))
+           (goto-char (point-min))
+           (display-buffer (current-buffer))
+           (let ((completion-ignore-case t))
+             (completing-read "Send mail via: "
+                              options nil 'require-match)))))
+    (customize-save-variable 'send-mail-function
+                            (cdr (assoc-string choice options t)))))
 \f
 (defun sendmail-sync-aliases ()
   (when mail-personal-alias-file