diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/mail/sendmail.el | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.bz2 emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/mail/sendmail.el')
| -rw-r--r-- | lisp/mail/sendmail.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index fe20ad921da..158435de86b 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -165,7 +165,8 @@ This is used by the default mail-sending commands. See also If `sendmail-query-once-function' is `query', ask the user what function to use, and then save that choice." (when (equal sendmail-query-once-function 'query) - (let* ((default + (let* ((mail-buffer (current-buffer)) + (default (cond ((or (and window-system (eq system-type 'darwin)) (eq system-type 'windows-nt)) @@ -195,7 +196,8 @@ function to use, and then save that choice." (if (y-or-n-p "Configure outgoing SMTP in Emacs? ") 'smtpmail-send-it default)) - (kill-buffer (current-buffer)))))) + (kill-buffer (current-buffer)) + (set-buffer mail-buffer))))) (customize-save-variable 'sendmail-query-once-function function))) (funcall sendmail-query-once-function)) |