diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-15 04:05:12 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-15 04:05:12 +0000 |
| commit | 13dc2bc2e89d4a7e2edbabd2f4cf33e77bcf8b74 (patch) | |
| tree | c28264229a369da0450d05fda006b6a49cc2b2c1 /lisp | |
| parent | 49fec531419726f3fd297f35ec1039bd1f7f0eda (diff) | |
| download | emacs-13dc2bc2e89d4a7e2edbabd2f4cf33e77bcf8b74.tar.gz emacs-13dc2bc2e89d4a7e2edbabd2f4cf33e77bcf8b74.tar.bz2 emacs-13dc2bc2e89d4a7e2edbabd2f4cf33e77bcf8b74.zip | |
(desktop-path): Check user-emacs-directory.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 3 insertions, 1 deletions
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) |