(desktop-path): Check user-emacs-directory.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 595f88462bf5f5d4b484e616c4aa21934e44a7f9..eeb90cb28c5d5bd5ecb969cad09c4adcee965499 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * desktop.el (desktop-path): Check user-emacs-directory.
+
        * emacs-lisp/bytecomp.el (byte-compile-refresh-preloaded): New function.
 
        * loadup.el: Use after-load-functions to GC after loading each file.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 5eebfd17aee2c4a84769150e296fef07545dd58c..29230e07cb58e5596913dfd039035d5c62e756d8 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -220,7 +220,7 @@ the normal hook `desktop-not-loaded-hook' is run."
   :group 'desktop
   :version "22.2")
 
-(defcustom desktop-path '("." "~")
+(defcustom desktop-path (list "." user-emacs-directory "~")
   "List of directories to search for the desktop file.
 The base name of the file is specified in `desktop-base-file-name'."
   :type '(repeat directory)