aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
authorLeo Liu2010-12-16 10:26:39 +0800
committerChong Yidong2010-12-16 10:26:39 +0800
commitbfc49a5bc42a977f2cebb131f3fee57ec8239a84 (patch)
treebafbd11dc3a81ae3d36b05092a7ba763db17ada1 /lisp/eshell
parent1c708c1a5f859ece6f4926e423e5845577cdffbe (diff)
downloademacs-bfc49a5bc42a977f2cebb131f3fee57ec8239a84.tar.gz
emacs-bfc49a5bc42a977f2cebb131f3fee57ec8239a84.zip
* eshell/eshell.el (eshell-directory-name): Use locate-user-emacs-file (Bug#7578).
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/eshell.el3
1 files changed, 2 insertions, 1 deletions
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."
285 "`eshell-buffer-name' is a member of `same-window-buffer-names'" 285 "`eshell-buffer-name' is a member of `same-window-buffer-names'"
286 (member eshell-buffer-name same-window-buffer-names)) 286 (member eshell-buffer-name same-window-buffer-names))
287 287
288(defcustom eshell-directory-name (convert-standard-filename "~/.eshell/") 288(defcustom eshell-directory-name
289 (locate-user-emacs-file "eshell/" ".eshell/")
289 "The directory where Eshell control files should be kept." 290 "The directory where Eshell control files should be kept."
290 :type 'directory 291 :type 'directory
291 :group 'eshell) 292 :group 'eshell)