diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-09-13 02:16:25 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-09-13 02:16:25 +0000 |
| commit | 42c3a9e31dd7cf6ea27ccbe41f0129cbb5d3a840 (patch) | |
| tree | 495d89024ee70a1965847aa4c08d7e571a7f00d9 /lisp/eshell/em-script.el | |
| parent | 1e2b6acfd27f40de73c37bdf0d06ba58c4c44700 (diff) | |
| download | emacs-42c3a9e31dd7cf6ea27ccbe41f0129cbb5d3a840.tar.gz | |
* eshell/em-hist.el:
* eshell/em-dirs.el (eshell-complete-user-reference): Declare
pcomplete functions and variables to avoid compiler warnings.
* eshell/em-script.el (eshell-login-script, eshell-rc-script):
* eshell/em-dirs.el (eshell-last-dir-ring-file-name):
* eshell/em-alias.el (eshell-aliases-file):
* eshell/em-hist.el (eshell-history-file-name): Use
expand-file-name instead of concat to make file names (Bug#4308).
Diffstat (limited to 'lisp/eshell/em-script.el')
| -rw-r--r-- | lisp/eshell/em-script.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index fbe10278c37..2d063ea4c2c 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -40,14 +40,14 @@ commands, as a script file." :type 'hook :group 'eshell-script) -(defcustom eshell-login-script (concat eshell-directory-name "login") +(defcustom eshell-login-script (expand-file-name "login" eshell-directory-name) "*If non-nil, a file to invoke when starting up Eshell interactively. This file should be a file containing Eshell commands, where comment lines begin with '#'." :type 'file :group 'eshell-script) -(defcustom eshell-rc-script (concat eshell-directory-name "profile") +(defcustom eshell-rc-script (expand-file-name "profile" eshell-directory-name) "*If non-nil, a file to invoke whenever Eshell is started. This includes when running `eshell-command'." :type 'file |