summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/mail/sendmail.el8
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd346f05afb..69d9ab9f977 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-30 Richard Ryniker <ryniker@alum.mit.edu> (tiny change)
+
+ * mail/sendmail.el (sendmail-send-it): Do not attempt to switch
+ to non-existent buffer (errbuf is not created when customization
+ variable mail-interactive is nil). (Bug#20211)
+
2015-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el (smie-backward-sexp-command)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7e9bd5bca2f..9fa7aa5a6f2 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1299,10 +1299,10 @@ external program defined by `sendmail-program'."
(error "Sending...failed to %s"
(buffer-substring (point-min) (point-max)))))))
(kill-buffer tembuf)
- (if (and (bufferp errbuf)
- (not error))
- (kill-buffer errbuf)
- (switch-to-buffer-other-window errbuf)))))
+ (when (buffer-live-p errbuf)
+ (if error
+ (switch-to-buffer-other-window errbuf)
+ (kill-buffer errbuf))))))
(autoload 'rmail-output-to-rmail-buffer "rmailout")