diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-22 21:57:27 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-22 21:57:27 -0700 |
| commit | f87b128460e1f13f2c7f20066348643bb3e16642 (patch) | |
| tree | 99747b7d064c508060d0d673bcbc9d56d038d182 /lisp/eshell/eshell.el | |
| parent | d361bc10dc5a45a3cb445c0fbca9e0d27fc9ee7a (diff) | |
| download | emacs-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/eshell.el')
| -rw-r--r-- | lisp/eshell/eshell.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index a76adb1fd94..9bdf8b3eb68 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -222,8 +222,7 @@ ;; things up. (eval-when-compile - (require 'cl-lib) - (require 'esh-util)) + (require 'cl-lib)) (require 'esh-util) (require 'esh-mode) @@ -318,6 +317,8 @@ buffer selected (or created)." Modules should use this variable so that they don't clutter non-interactive sessions, such as when using `eshell-command'.") +(declare-function eshell-add-input-to-history "em-hist" (input)) + ;;;###autoload (defun eshell-command (&optional command arg) "Execute the Eshell command string COMMAND. @@ -333,7 +334,8 @@ With prefix ARG, insert output into the current buffer at point." (eshell-return-exits-minibuffer)) (unless command (setq command (read-from-minibuffer "Emacs shell command: ")) - (eshell-add-input-to-history command)))) + (if (eshell-using-module 'eshell-hist) + (eshell-add-input-to-history command))))) (unless command (error "No command specified!")) ;; redirection into the current buffer is achieved by adding an |