From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 15 Sep 2009 04:05:12 +0000 (+0000)
Subject: (desktop-path): Check user-emacs-directory.
X-Git-Tag: emacs-pretest-23.1.90~1306
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13dc2bc2e89d4a7e2edbabd2f4cf33e77bcf8b74;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 595f88462bf..eeb90cb28c5 100644
--- 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 5eebfd17aee..29230e07cb5 100644
--- 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)