* lisp/mail/emacsbug.el (report-emacs-bug-hook): Mailclient ignores From.

2 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f96a838cc5..307aac72bc5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -56,6 +56,10 @@
         (rcirc-decode-coding-system): Allow value nil for automatic coding
         system detection.
 
+2011-06-01  Glenn Morris  <rgm@gnu.org>
+
+        * mail/emacsbug.el (report-emacs-bug-hook): Mailclient ignores From.
+
 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.el (image-animate-max-time): Allow nil and t values.
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index ce4dde29693..b1b3c443a09 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -331,6 +331,7 @@ usually do not have translators to read other languages for them.\n\n")
 
 ;; It's the default mail mode, so it seems OK to use its features.
 (autoload 'message-bogus-recipient-p "message")
+(defvar message-send-mail-function)
 
 (defun report-emacs-bug-hook ()
   "Do some checking before sending a bug report."
@@ -343,6 +344,10 @@ usually do not have translators to read other languages for them.\n\n")
                        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 (eq major-mode '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)