[Emacs-diffs] /srv/bzr/emacs/trunk r107491: Further `sendmail-query-once' cleanups for sending bug reports

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 107491
fixes bug(s): http://debbugs.gnu.org/10897
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2012-03-03 15:43:03 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mail/emacsbug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-02 22:16:21 +0000
+++ b/lisp/ChangeLog    2012-03-03 14:43:03 +0000
@@ -1,3 +1,10 @@
+2012-03-03  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        Depessimize the handling of very large macros.

=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el     2012-02-10 18:16:19 +0000
+++ b/lisp/mail/emacsbug.el     2012-03-03 14:43:03 +0000
@@ -394,7 +394,11 @@
     ;; 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))))