From e391d88705efd3897996ed81e1f37b936dc3aa21 Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Sat, 17 Jan 2015 19:12:45 +0000 Subject: [PATCH] Do not clear the session when trying to read a non-existent desktop file. * lisp/desktop.el (desktop-read): Do not call desktop-clear when no desktop file is found. Fixes: debbugs:18371 --- lisp/ChangeLog | 3 +++ lisp/desktop.el | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d894b1ffca0..60732e781fc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -14,6 +14,9 @@ inhibit-point-motion-hooks in addition to inhibit-read-only. (Bug#18246) + * desktop.el (desktop-read): Do not call desktop-clear when no + desktop file is found. (Bug#18371) + 2015-01-17 Stefan Monnier * emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from diff --git a/lisp/desktop.el b/lisp/desktop.el index 3845f940d02..c355d7f080f 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1191,7 +1191,6 @@ Using it may cause conflicts. Use it anyway? " owner))))) (desktop-auto-save-enable) t)) ;; No desktop file found. - (desktop-clear) (let ((default-directory desktop-dirname)) (run-hooks 'desktop-no-desktop-file-hook)) (message "No desktop file.") -- 2.39.5