(desktop-buffer-rmail): Handle the situation

where the RMAIL file is locked, mail is waiting, and the
user selects `quit' gracefully.

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/desktop.el b/lisp/desktop.el
index fa92582fef6..2e12ac34e7a 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -447,7 +447,11 @@ autoloaded files."
 ;; ----------------------------------------------------------------------------
 (defun desktop-buffer-rmail () "Load an RMAIL file."
   (if (eq 'rmail-mode mam)
-      (progn (rmail-input fn) t)))
+      (condition-case error
+        (progn (rmail-input fn) t)
+      (file-locked
+       (kill-buffer (current-buffer))
+       'ignored))))
 ;; ----------------------------------------------------------------------------
 (defun desktop-buffer-mh () "Load a folder in the mh system."
   (if (eq 'mh-folder-mode mam)