Mercurial > emacs
changeset 111975:2dc54f49f83f
* eshell/eshell.el (eshell-directory-name): Use locate-user-emacs-file (Bug#7578).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 16 Dec 2010 10:26:39 +0800 |
parents | 2faf9c0a9055 |
children | fbefd9a68046 |
files | lisp/ChangeLog lisp/eshell/eshell.el |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 16 09:20:46 2010 +0800 +++ b/lisp/ChangeLog Thu Dec 16 10:26:39 2010 +0800 @@ -1,3 +1,8 @@ +2010-12-16 Leo <sdl.web@gmail.com> + + * eshell/eshell.el (eshell-directory-name): Use + locate-user-emacs-file (Bug#7578). + 2010-12-15 Glenn Morris <rgm@gnu.org> * loadup.el (symbol-file-load-history-loaded): Remove; unused.
--- a/lisp/eshell/eshell.el Thu Dec 16 09:20:46 2010 +0800 +++ b/lisp/eshell/eshell.el Thu Dec 16 10:26:39 2010 +0800 @@ -285,7 +285,8 @@ "`eshell-buffer-name' is a member of `same-window-buffer-names'" (member eshell-buffer-name same-window-buffer-names)) -(defcustom eshell-directory-name (convert-standard-filename "~/.eshell/") +(defcustom eshell-directory-name + (locate-user-emacs-file "eshell/" ".eshell/") "The directory where Eshell control files should be kept." :type 'directory :group 'eshell)