[Emacs-diffs] /srv/bzr/emacs/trunk r108672: * desktop.el (desktop-read): Use user-emacs-directory if desktop-path is nil.

[Chong Yidong]

------------------------------------------------------------
revno: 108672
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-21 15:25:56 +0800
message:
  * desktop.el (desktop-read): Use user-emacs-directory if desktop-path is nil.
modified:
  lisp/ChangeLog
  lisp/desktop.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-21 07:15:42 +0000
+++ b/lisp/ChangeLog    2012-06-21 07:25:56 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2012-06-21 07:15:42 +0000
+++ b/lisp/desktop.el   2012-06-21 07:25:56 +0000
@@ -966,8 +966,8 @@
                (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)