summaryrefslogtreecommitdiff
path: root/lisp/eshell/esh-util.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-05-22 21:57:27 -0700
committerGlenn Morris <rgm@gnu.org>2013-05-22 21:57:27 -0700
commitf87b128460e1f13f2c7f20066348643bb3e16642 (patch)
tree99747b7d064c508060d0d673bcbc9d56d038d182 /lisp/eshell/esh-util.el
parentd361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a (diff)
downloademacs-f87b128460e1f13f2c7f20066348643bb3e16642.tar.gz
emacs-f87b128460e1f13f2c7f20066348643bb3e16642.tar.bz2
emacs-f87b128460e1f13f2c7f20066348643bb3e16642.zip
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires. (eshell-parse-command): Autoload. * lisp/eshell/em-xtra.el: Adjust requires. (eshell-parse-command): Autoload. * lisp/eshell/esh-ext.el: Adjust requires. (eshell-parse-command, eshell-close-handles): Autoload. * lisp/eshell/esh-io.el: Adjust requires. (eshell-output-filter): Autoload. * lisp/eshell/esh-util.el: No need to load tramp when compiling. (tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare. (eshell-parse-ange-ls): Require ange-ftp and tramp. * lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el: * lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el: * lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el: * lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el: * lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el: * lisp/eshell/esh-var.el: Adjust requires. * lisp/eshell/eshell.el: Do not require esh-util twice. (eshell-add-input-to-history): Declare. (eshell-command): Check history module is active before using it.
Diffstat (limited to 'lisp/eshell/esh-util.el')
-rw-r--r--lisp/eshell/esh-util.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index f9b86219e9b..dd344eb50a2 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -605,10 +605,16 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
(autoload 'parse-time-string "parse-time"))
(eval-when-compile
- (require 'ange-ftp nil t)
- (require 'tramp nil t))
+ (require 'ange-ftp nil t)) ; ange-ftp-parse-filename
+
+(defvar tramp-file-name-structure)
+(declare-function ange-ftp-ls "ange-ftp"
+ (file lsargs parse &optional no-error wildcard))
+(declare-function ange-ftp-file-modtime "ange-ftp" (file))
(defun eshell-parse-ange-ls (dir)
+ (require 'ange-ftp)
+ (require 'tramp)
(let ((ange-ftp-name-format
(list (nth 0 tramp-file-name-structure)
(nth 3 tramp-file-name-structure)