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-dirs.el | |
| parent | 1e2b6acfd27f40de73c37bdf0d06ba58c4c44700 (diff) | |
| download | emacs-42c3a9e31dd7cf6ea27ccbe41f0129cbb5d3a840.tar.gz emacs-42c3a9e31dd7cf6ea27ccbe41f0129cbb5d3a840.tar.bz2 emacs-42c3a9e31dd7cf6ea27ccbe41f0129cbb5d3a840.zip | |
* 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-dirs.el')
| -rw-r--r-- | lisp/eshell/em-dirs.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index fa1af37f808..cc95d810213 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -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))) |