procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* desktop.el (desktop-read): Use user-emacs-directory if desktop-path is nil.

Browse source
This commit is contained in:
Chong Yidong 2012-06-21 15:25:56 +08:00
parent e76f0800d2
commit 6b67c0d4c9
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -2,6 +2,7 @@
* desktop.el (desktop-read): Don't prompt if daemon (Bug#11674).
(desktop-path): Remove . from the default value (Bug#10977).
(desktop-read): Use user-emacs-directory if desktop-path is nil.
2012-06-20 Chong Yidong <cyd@gnu.org>

4
lisp/desktop.el
View file

@ -966,8 +966,8 @@ It returns t if a desktop file was loaded, nil otherwise."
(and dirs (car dirs)))
;; If not found and `desktop-path' is non-nil, use its first element.
(and desktop-path (car desktop-path))
;; Default: Home directory.
"~"))))
;; Default: .emacs.d.
user-emacs-directory))))
(if (file-exists-p (desktop-full-file-name))
;; Desktop file found, but is it already in use?
(let ((desktop-first-buffer nil)