diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-02 01:25:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-02 01:25:28 -0700 |
| commit | 275a5dd65098a2d6fcc14c21f805fc8d5e4479ee (patch) | |
| tree | a03e79b0a7c066940ed02cd11927c7fd4080f092 /lisp/mail | |
| parent | 97f4ea979720e535ade3fe0055fb710e18fb7b5d (diff) | |
| parent | f797625a8ca7bc973b6943c6fce97f1e479a283d (diff) | |
| download | emacs-275a5dd65098a2d6fcc14c21f805fc8d5e4479ee.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/emacsbug.el | 5 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index ce4dde29693..6b062f2298f 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 (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) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 60f3062ea7b..2c5fa014a94 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -470,7 +470,8 @@ by Emacs.)") (put 'mail-mailer-swallows-blank-line 'risky-local-variable t) ; gets evalled (make-obsolete-variable 'mail-mailer-swallows-blank-line - "no need to set this on any modern system." "24.1") + "no need to set this on any modern system." + "24.1" 'set) (defvar mail-mode-syntax-table ;; define-derived-mode will make it inherit from text-mode-syntax-table. |