[Emacs-diffs] /srv/bzr/emacs/trunk r102672: * eshell/eshell.el (eshell-directory-name): Use locate-user-emacs-file (Bug#7578).

[Chong Yidong]

------------------------------------------------------------
revno: 102672
author: Leo <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-16 10:26:39 +0800
message:
  * eshell/eshell.el (eshell-directory-name): Use locate-user-emacs-file 
(Bug#7578).
modified:
  lisp/ChangeLog
  lisp/eshell/eshell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-15 08:16:53 +0000
+++ b/lisp/ChangeLog    2010-12-16 02:26:39 +0000
@@ -1,3 +1,8 @@
+2010-12-16  Leo  <address@hidden>
+
+       * eshell/eshell.el (eshell-directory-name): Use
+       locate-user-emacs-file (Bug#7578).
+
 2010-12-15  Glenn Morris  <address@hidden>
 
        * loadup.el (symbol-file-load-history-loaded): Remove; unused.

=== modified file 'lisp/eshell/eshell.el'
--- a/lisp/eshell/eshell.el     2010-05-25 02:11:08 +0000
+++ b/lisp/eshell/eshell.el     2010-12-16 02:26:39 +0000
@@ -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)