Mercurial > emacs
changeset 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).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 13 Sep 2009 02:16:25 +0000 |
| parents | 403125cdfb24 |
| children | 45d111e58a36 |
| files | lisp/ChangeLog lisp/eshell/em-alias.el lisp/eshell/em-dirs.el lisp/eshell/em-hist.el lisp/eshell/em-script.el |
| diffstat | 5 files changed, 28 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Sep 13 02:14:25 2009 +0000 +++ b/lisp/ChangeLog Sun Sep 13 02:16:25 2009 +0000 @@ -1,3 +1,17 @@ +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):
--- a/lisp/eshell/em-alias.el Sun Sep 13 02:14:25 2009 +0000 +++ b/lisp/eshell/em-alias.el Sun Sep 13 02:16:25 2009 +0000 @@ -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
--- a/lisp/eshell/em-dirs.el Sun Sep 13 02:14:25 2009 +0000 +++ b/lisp/eshell/em-dirs.el Sun Sep 13 02:16:25 2009 +0000 @@ -138,7 +138,7 @@ :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 @@ (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)))
--- a/lisp/eshell/em-hist.el Sun Sep 13 02:14:25 2009 +0000 +++ b/lisp/eshell/em-hist.el Sun Sep 13 02:16:25 2009 +0000 @@ -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 @@ 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)))
--- 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