summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-04-29 11:51:49 -0400
committerGlenn Morris <rgm@gnu.org>2014-04-29 11:51:49 -0400
commit9a3f71f795f0a39f28c0d0e9693537acb7cf8604 (patch)
tree855b2d863246dc6376c1ec7b7b7cea4ed33ed44b /lisp
parenta55ea27f60f94ff3fc3e02e253056137fc56c35b (diff)
downloademacs-9a3f71f795f0a39f28c0d0e9693537acb7cf8604.tar.gz
* lisp/mail/rmail.el (rmail-quit): Handle killed summaries.
Fixes: debbugs:17283
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/rmail.el5
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb23d634ac1..f7e1fd4cea8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-29 Glenn Morris <rgm@gnu.org>
+
+ * mail/rmail.el (rmail-quit): Handle killed summaries. (Bug#17283)
+
2014-04-27 Matthias Dahl <matthias.dahl@binary-island.eu>
* faces.el (face-spec-recalc): Apply X resources only after the
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1a016199757..486c06053b3 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1,7 +1,6 @@
;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
-;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software Foundation, Inc.
;; Maintainer: emacs-devel@gnu.org
;; Keywords: mail
@@ -1573,7 +1572,7 @@ Hook `rmail-quit-hook' is run after expunging."
(when (boundp 'rmail-quit-hook)
(run-hooks 'rmail-quit-hook))
;; Don't switch to the summary buffer even if it was recently visible.
- (when rmail-summary-buffer
+ (when (rmail-summary-exists)
(with-current-buffer rmail-summary-buffer
(set-buffer-modified-p nil))
(replace-buffer-in-windows rmail-summary-buffer)