Commit 42c3a9e3 authored by Chong Yidong's avatar Chong Yidong
Browse files

* 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).
parent 1e2b6acf
2009-09-13 Chong Yidong <cyd@stupidchicken.com>
* eshell/em-hist.el:
* eshell/em-dirs.el (eshell-complete-user-reference): Declare
pcomplete functions and variables to avoid compiler warnings.
2009-09-13 Leo <sdl.web@gmail.com> (tiny change)
* 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).
2009-09-13 Glenn Morris <rgm@gnu.org>
* ediff-merg.el (ediff-do-merge):
......
......@@ -102,7 +102,7 @@
;; :link '(info-link "(eshell)Command aliases")
:group 'eshell-module)
(defcustom eshell-aliases-file (concat eshell-directory-name "alias")
(defcustom eshell-aliases-file (expand-file-name "alias" eshell-directory-name)
"*The file in which aliases are kept.
Whenever an alias is defined by the user, using the `alias' command,
it will be written to this file. Thus, alias definitions (and
......
......@@ -138,7 +138,7 @@ This is effective only if directory tracking is enabled."
:group 'eshell-dirs)
(defcustom eshell-last-dir-ring-file-name
(concat eshell-directory-name "lastdir")
(expand-file-name "lastdir" eshell-directory-name)
"*If non-nil, name of the file to read/write the last-dir-ring.
See also `eshell-read-last-dir-ring' and `eshell-write-last-dir-ring'.
If it is nil, the last-dir-ring will not be written to disk."
......@@ -276,6 +276,11 @@ Thus, this does not include the current directory.")
(path (eshell-find-previous-directory regexp)))
(concat (or path letter) "/"))))
(defvar pcomplete-stub)
(defvar pcomplete-last-completion-raw)
(declare-function pcomplete-actual-arg "pcomplete")
(declare-function pcomplete-uniqify-list "pcomplete")
(defun eshell-complete-user-reference ()
"If there is a user reference, complete it."
(let ((arg (pcomplete-actual-arg)))
......
......@@ -86,7 +86,7 @@
:group 'eshell-hist)
(defcustom eshell-history-file-name
(concat eshell-directory-name "history")
(expand-file-name "history" eshell-directory-name)
"*If non-nil, name of the file to read/write input history.
See also `eshell-read-history' and `eshell-write-history'.
If it is nil, Eshell will use the value of HISTFILE."
......@@ -583,6 +583,10 @@ See also `eshell-read-history'."
posb (cdr posb)
pose (cdr pose))))))))
(defvar pcomplete-stub)
(defvar pcomplete-last-completion-raw)
(declare-function pcomplete-actual-arg "pcomplete")
(defun eshell-complete-history-reference ()
"Complete a history reference, by completing the event designator."
(let ((arg (pcomplete-actual-arg)))
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment