# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1252987512 0
# Node ID 7700dc1d76fdec15ef12859aa8c034e4d85baaba
# Parent  8da5090a59d7c2a45bc6126a20a057b24abdcb81
(desktop-path): Check user-emacs-directory.

diff -r 8da5090a59d7 -r 7700dc1d76fd lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 15 04:03:35 2009 +0000
+++ b/lisp/ChangeLog	Tue Sep 15 04:05:12 2009 +0000
@@ -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 -r 8da5090a59d7 -r 7700dc1d76fd lisp/desktop.el
--- a/lisp/desktop.el	Tue Sep 15 04:03:35 2009 +0000
+++ b/lisp/desktop.el	Tue Sep 15 04:05:12 2009 +0000
@@ -220,7 +220,7 @@
   :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)