[Emacs-diffs] /srv/bzr/emacs/trunk r107499: Fix up the emacsbug query-once logic from the previous patch

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 107499
fixes bug(s): http://debbugs.gnu.org/10897
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2012-03-04 14:34:33 +0100
message:
  Fix up the emacsbug query-once logic from the previous patch
  
  * mail/emacsbug.el (report-emacs-bug-hook): Fix up thinko in
  previous patch: Check `message-send-mail-function', and not the
  default function.
modified:
  lisp/ChangeLog
  lisp/mail/emacsbug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-04 11:21:31 +0000
+++ b/lisp/ChangeLog    2012-03-04 13:34:33 +0000
@@ -1,3 +1,9 @@
+2012-03-04  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/emacsbug.el (report-emacs-bug-hook): Fix up thinko in
+       previous patch: Check `message-send-mail-function', and not the
+       default function (bug#10897).
+
 2012-03-04  Michael Albinus  <address@hidden>
 
        * notifications.el (notifications-unique-name): New defvar.

=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el     2012-03-03 14:43:03 +0000
+++ b/lisp/mail/emacsbug.el     2012-03-04 13:34:33 +0000
@@ -395,8 +395,7 @@
     ;; questions about From header validity if the user is going to
     ;; use mailclient, anyway.
     (when (or (and (derived-mode-p 'message-mode)
-                  (eq (message-default-send-mail-function)
-                      'sendmail-query-once))
+                  (eq message-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)