# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1292466399 -28800
# Node ID 2dc54f49f83f60f67668159d6b27e1f46ba8a180
# Parent  2faf9c0a9055c8c223c5c3ad7ad1cb10fb3acebd
* eshell/eshell.el (eshell-directory-name): Use locate-user-emacs-file (Bug#7578).

diff -r 2faf9c0a9055 -r 2dc54f49f83f lisp/ChangeLog
--- 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.
diff -r 2faf9c0a9055 -r 2dc54f49f83f lisp/eshell/eshell.el
--- 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)