2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b16df17a13..cdb98b15551 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 89ec3ab9c60..3c534f049c5 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -285,7 +285,8 @@ shells such as bash, zsh, rc, 4dos."
   "`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)