diff lisp/eshell/em-script.el @ 104994:48428e99bf83

* 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).

--- a/lisp/eshell/em-script.el	Sun Sep 13 02:14:25 2009 +0000
+++ b/lisp/eshell/em-script.el	Sun Sep 13 02:16:25 2009 +0000
@@ -40,14 +40,14 @@
   :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