diff options
Diffstat (limited to 'lisp/eshell/eshell.el')
| -rw-r--r-- | lisp/eshell/eshell.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index d93658b9749..7690a102a9b 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -1,7 +1,6 @@ ;;; eshell.el --- the Emacs command shell -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1999-2011 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Version: 2.4.2 @@ -285,7 +284,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) @@ -404,7 +404,7 @@ With prefix ARG, insert output into the current buffer at point." (assert (not (eshell-interactive-process))) (goto-char (point-max)) (while (and (bolp) (not (bobp))) - (delete-backward-char 1))) + (delete-char -1))) (assert (and buf (buffer-live-p buf))) (unless arg (let ((len (if (not intr) 2 @@ -490,5 +490,4 @@ Emacs." (provide 'eshell) -;; arch-tag: 9d4d5214-0e4e-4e02-b349-39add640d63f ;;; eshell.el ends here |