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 d894b1ffca041dd171b2da6bfcd79d63633740f2..60732e781fc2a159bc451b7eee950416d8491419 100644 (file)
--- 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 3845f940d0285a00e4d25d7b2a8d7f409cbcbf08..c355d7f080fb5698c43a5f07a727bfda285883fe 100644 (file)
--- 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.")