[Emacs-diffs] emacs/lisp ChangeLog desktop.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/15 04:05:15

Modified files:
        lisp           : ChangeLog desktop.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16174&r2=1.16175
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/desktop.el?cvsroot=emacs&r1=1.137&r2=1.138

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16174
retrieving revision 1.16175
diff -u -b -r1.16174 -r1.16175
--- ChangeLog   15 Sep 2009 04:03:35 -0000      1.16174
+++ ChangeLog   15 Sep 2009 04:05:12 -0000      1.16175
@@ -1,5 +1,7 @@
 2009-09-15  Stefan Monnier  <address@hidden>
 
+       * 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.

Index: desktop.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- desktop.el  19 Jul 2009 00:34:01 -0000      1.137
+++ desktop.el  15 Sep 2009 04:05:15 -0000      1.138
@@ -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)