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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d130250dcfdcef2387c9585db94144a7f3269e6..fb710374e18024c09977a7c5a6eac82f384e597b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 2fd9d7f10ad5995a10ef025c29c60538e677e0b3..2c2106e18b7ffbbe11f50b97fb724d56f8de1731 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -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)