From: Ivan Shmakov <ivan@siamics.net>
Date: Sat, 17 Jan 2015 19:12:45 +0000 (+0000)
Subject: Do not clear the session when trying to read a non-existent desktop file.
X-Git-Tag: emacs-25.0.90~2597^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e391d88705efd3897996ed81e1f37b936dc3aa21;p=emacs.git

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
---

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  <monnier@iro.umontreal.ca>
 
 	* 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.")