Commit e391d887 authored by Ivan Shmakov's avatar Ivan Shmakov
Browse files

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
parent 17285446
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
inhibit-point-motion-hooks in addition to inhibit-read-only. inhibit-point-motion-hooks in addition to inhibit-read-only.
(Bug#18246) (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> 2015-01-17 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from * emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from
......
...@@ -1191,7 +1191,6 @@ Using it may cause conflicts. Use it anyway? " owner))))) ...@@ -1191,7 +1191,6 @@ Using it may cause conflicts. Use it anyway? " owner)))))
(desktop-auto-save-enable) (desktop-auto-save-enable)
t)) t))
;; No desktop file found. ;; No desktop file found.
(desktop-clear)
(let ((default-directory desktop-dirname)) (let ((default-directory desktop-dirname))
(run-hooks 'desktop-no-desktop-file-hook)) (run-hooks 'desktop-no-desktop-file-hook))
(message "No desktop file.") (message "No desktop file.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment