summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-07-06 19:45:38 +0000
committerRichard M. Stallman <rms@gnu.org>1994-07-06 19:45:38 +0000
commit9aaa639552ad1e8ffa6b61ee9a0ab432ba729a29 (patch)
tree87025ff083777dbee80a42931eb6369ce70dcf95 /lisp/desktop.el
parentfe7f555793a59343b39fa002b7953cf7cc1a0bde (diff)
downloademacs-9aaa639552ad1e8ffa6b61ee9a0ab432ba729a29.tar.gz
(desktop-buffer-rmail): Handle the situation
where the RMAIL file is locked, mail is waiting, and the user selects `quit' gracefully.
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el6
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)