diff lisp/eshell/em-hist.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).
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 13 Sep 2009 02:16:25 +0000
parents a9dc0e7c3f2b
children 1d1d5d9bd884
line wrap: on
line diff
--- 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)))