diff options
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/mailabbrev.el | 3 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index 06af543b4da..587b7d0187e 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -587,7 +587,8 @@ of a mail alias. The value is set up, buffer-local, when first needed.") (prog2 (message "Making completion list...") (all-completions alias mail-abbrevs) - (message "Making completion list...done")))))))) + (message "Making completion list...done")) + alias)))))) (defun mail-abbrev-next-line (&optional arg) "Expand any mail abbrev, then move cursor vertically down ARG lines. diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index f7c62026d80..81afe688c10 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -120,7 +120,10 @@ nil means let mailer mail back a message to report errors." ;; Useful to set in site-init.el ;;;###autoload -(defcustom send-mail-function 'sendmail-send-it +(defcustom send-mail-function + (if (and window-system (memq system-type '(darwin windows-nt))) + 'mailclient-send-it + 'sendmail-send-it) "Function to call to send the current buffer as mail. The headers should be delimited by a line which is not a valid RFC822 header or continuation line, |