From: Lars Magne Ingebrigtsen Date: Sun, 4 Mar 2012 13:34:33 +0000 (+0100) Subject: Fix up the emacsbug query-once logic from the previous patch X-Git-Tag: emacs-pretest-24.0.05~173 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e627be4c9ddaec9e4037166ebbac2d09b5bce28a;p=emacs.git 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. Fixes: debbugs:10897 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5392e197d9f..102ef01d772 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-03-04 Lars Magne Ingebrigtsen + + * 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 * notifications.el (notifications-unique-name): New defvar. diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index aa98da87904..853321cba6f 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -395,8 +395,7 @@ and send the mail again%s." ;; 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)