[Emacs-diffs] /srv/bzr/emacs/trunk r112675: Silence many eshell compilation warnings

[Glenn Morris]

------------------------------------------------------------
revno: 112675
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-22 21:57:27 -0700
message:
  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.
modified:
  lisp/ChangeLog
  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/em-tramp.el
  lisp/eshell/em-xtra.el
  lisp/eshell/esh-arg.el
  lisp/eshell/esh-ext.el
  lisp/eshell/esh-io.el
  lisp/eshell/esh-mode.el
  lisp/eshell/esh-opt.el
  lisp/eshell/esh-proc.el
  lisp/eshell/esh-util.el
  lisp/eshell/esh-var.el
  lisp/eshell/eshell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-23 04:48:40 +0000
+++ b/lisp/ChangeLog    2013-05-23 04:57:27 +0000
@@ -1,5 +1,27 @@
 2013-05-23  Glenn Morris  <address@hidden>
 
+       * eshell/em-tramp.el: Adjust requires.
+       (eshell-parse-command): Autoload.
+       * eshell/em-xtra.el: Adjust requires.
+       (eshell-parse-command): Autoload.
+       * eshell/esh-ext.el: Adjust requires.
+       (eshell-parse-command, eshell-close-handles): Autoload.
+       * eshell/esh-io.el: Adjust requires.
+       (eshell-output-filter): Autoload.
+       * 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.
+       * eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
+       * eshell/em-cmpl.el, eshell/em-glob.el, eshell/em-pred.el:
+       * eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-smart.el:
+       * eshell/em-term.el, eshell/esh-arg.el, eshell/esh-mode.el:
+       * eshell/esh-opt.el, eshell/esh-proc.el:
+       * eshell/esh-var.el: Adjust requires.
+       * 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.
+
        * eshell/em-ls.el (eshell-ls-dir): Fix -A handling.
 
 2013-05-22  Leo Liu  <address@hidden>

=== modified file 'lisp/eshell/em-alias.el'
--- a/lisp/eshell/em-alias.el   2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-alias.el   2013-05-23 04:57:27 +0000
@@ -90,8 +90,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'esh-util))
 (require 'eshell)
 
 ;;;###autoload

=== modified file 'lisp/eshell/em-banner.el'
--- a/lisp/eshell/em-banner.el  2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-banner.el  2013-05-23 04:57:27 +0000
@@ -39,11 +39,11 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl-lib)
-  (require 'esh-mode)
-  (require 'eshell))
+  (require 'cl-lib))
 
 (require 'esh-util)
+(require 'esh-mode)
+(require 'eshell)
 
 ;;;###autoload
 (progn

=== modified file 'lisp/eshell/em-basic.el'
--- a/lisp/eshell/em-basic.el   2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-basic.el   2013-05-23 04:57:27 +0000
@@ -59,9 +59,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'esh-util))
-
+(require 'esh-util)
 (require 'eshell)
 (require 'esh-opt)
 

=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el    2013-05-06 07:20:35 +0000
+++ b/lisp/eshell/em-cmpl.el    2013-05-23 04:57:27 +0000
@@ -70,10 +70,12 @@
 ;;; Code:
 (require 'pcomplete)
 
+(require 'esh-mode)
+(require 'esh-util)
+
 (eval-when-compile
   (require 'cl-lib)
   (require 'eshell))
-(require 'esh-util)
 
 ;;;###autoload
 (progn

=== modified file 'lisp/eshell/em-glob.el'
--- a/lisp/eshell/em-glob.el    2013-05-09 01:40:20 +0000
+++ b/lisp/eshell/em-glob.el    2013-05-23 04:57:27 +0000
@@ -49,8 +49,8 @@
 
 ;;; Code:
 
+(require 'esh-util)
 (eval-when-compile (require 'eshell))
-(require 'esh-util)
 
 ;;;###autoload
 (progn

=== modified file 'lisp/eshell/em-pred.el'
--- a/lisp/eshell/em-pred.el    2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-pred.el    2013-05-23 04:57:27 +0000
@@ -46,6 +46,8 @@
 
 ;;; Code:
 
+(require 'esh-util)
+(require 'esh-arg)
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload

=== modified file 'lisp/eshell/em-prompt.el'
--- a/lisp/eshell/em-prompt.el  2013-04-20 19:11:25 +0000
+++ b/lisp/eshell/em-prompt.el  2013-05-23 04:57:27 +0000
@@ -26,6 +26,7 @@
 
 ;;; Code:
 
+(require 'esh-mode)
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload

=== modified file 'lisp/eshell/em-rebind.el'
--- a/lisp/eshell/em-rebind.el  2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-rebind.el  2013-05-23 04:57:27 +0000
@@ -23,6 +23,7 @@
 
 ;;; Code:
 
+(require 'esh-mode)
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload

=== modified file 'lisp/eshell/em-smart.el'
--- a/lisp/eshell/em-smart.el   2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-smart.el   2013-05-23 04:57:27 +0000
@@ -68,6 +68,7 @@
 
 ;;; Code:
 
+(require 'esh-mode)
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload

=== modified file 'lisp/eshell/em-term.el'
--- a/lisp/eshell/em-term.el    2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-term.el    2013-05-23 04:57:27 +0000
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'esh-util)
+(require 'esh-ext)
 (eval-when-compile (require 'eshell))
 (require 'term)
 

=== modified file 'lisp/eshell/em-tramp.el'
--- a/lisp/eshell/em-tramp.el   2013-03-26 22:08:58 +0000
+++ b/lisp/eshell/em-tramp.el   2013-05-23 04:57:27 +0000
@@ -25,13 +25,13 @@
 
 ;;; Code:
 
+(require 'esh-util)
+
 (eval-when-compile
   (require 'esh-mode)
   (require 'eshell)
   (require 'tramp))
 
-(require 'esh-util)
-
 ;;;###autoload
 (progn
  (defgroup eshell-tramp nil
@@ -53,6 +53,8 @@
        (append '("su" "sudo")
                eshell-complex-commands)))
 
+(autoload 'eshell-parse-command "esh-cmd")
+
 (defun eshell/su (&rest args)
   "Alias \"su\" to call TRAMP.
 

=== modified file 'lisp/eshell/em-xtra.el'
--- a/lisp/eshell/em-xtra.el    2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/em-xtra.el    2013-05-23 04:57:27 +0000
@@ -23,6 +23,7 @@
 
 ;;; Code:
 
+(require 'esh-util)
 (eval-when-compile
   (require 'eshell)
   (require 'pcomplete))
@@ -40,6 +41,8 @@
 
 ;;; Functions:
 
+(autoload 'eshell-parse-command "esh-cmd")
+
 (defun eshell/expr (&rest args)
   "Implementation of expr, using the calc package."
   (if (not (fboundp 'calc-eval))

=== modified file 'lisp/eshell/esh-arg.el'
--- a/lisp/eshell/esh-arg.el    2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/esh-arg.el    2013-05-23 04:57:27 +0000
@@ -27,7 +27,7 @@
 
 (provide 'esh-arg)
 
-(eval-when-compile (require 'eshell))
+(require 'esh-mode)
 
 (defgroup eshell-arg nil
   "Argument parsing involves transforming the arguments passed on the

=== modified file 'lisp/eshell/esh-ext.el'
--- a/lisp/eshell/esh-ext.el    2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/esh-ext.el    2013-05-23 04:57:27 +0000
@@ -33,10 +33,12 @@
 
 (provide 'esh-ext)
 
+(require 'esh-util)
+
 (eval-when-compile
   (require 'cl-lib)
+  (require 'esh-io)
   (require 'esh-cmd))
-(require 'esh-util)
 (require 'esh-opt)
 
 (defgroup eshell-ext nil
@@ -103,6 +105,8 @@
   :type '(choice file (const nil))
   :group 'eshell-ext)
 
+(autoload 'eshell-parse-command "esh-cmd")
+
 (defsubst eshell-invoke-batch-file (&rest args)
   "Invoke a .BAT or .CMD file on DOS/Windows systems."
   ;; since CMD.EXE can't handle forward slashes in the initial
@@ -179,6 +183,8 @@
        (error "%s: external command not found"
               (substring command 1))))))
 
+(autoload 'eshell-close-handles "esh-io")
+
 (defun eshell-remote-command (command args)
   "Insert output from a remote COMMAND, using ARGS.
 A remote command is something that executes on a different machine.

=== modified file 'lisp/eshell/esh-io.el'
--- a/lisp/eshell/esh-io.el     2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/esh-io.el     2013-05-23 04:57:27 +0000
@@ -58,9 +58,11 @@
 
 (provide 'esh-io)
 
+(require 'esh-arg)
+(require 'esh-util)
+
 (eval-when-compile
-  (require 'cl-lib)
-  (require 'eshell))
+  (require 'cl-lib))
 
 (defgroup eshell-io nil
   "Eshell's I/O management code provides a scheme for treating many
@@ -465,6 +467,8 @@
   (eshell-print object)
   (eshell-print "\n"))
 
+(autoload 'eshell-output-filter "esh-mode")
+
 (defun eshell-output-object-to-target (object target)
   "Insert OBJECT into TARGET.
 Returns what was actually sent, or nil if nothing was sent."

=== modified file 'lisp/eshell/esh-mode.el'
--- a/lisp/eshell/esh-mode.el   2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/esh-mode.el   2013-05-23 04:57:27 +0000
@@ -60,7 +60,7 @@
 
 (provide 'esh-mode)
 
-(eval-when-compile (require 'esh-util))
+(require 'esh-util)
 (require 'esh-module)
 (require 'esh-cmd)
 (require 'esh-io)

=== modified file 'lisp/eshell/esh-opt.el'
--- a/lisp/eshell/esh-opt.el    2013-05-15 23:55:41 +0000
+++ b/lisp/eshell/esh-opt.el    2013-05-23 04:57:27 +0000
@@ -25,7 +25,7 @@
 
 (provide 'esh-opt)
 
-(eval-when-compile (require 'esh-ext))
+(require 'esh-ext)
 
 ;; Unused.
 ;;; (defgroup eshell-opt nil

=== modified file 'lisp/eshell/esh-proc.el'
--- a/lisp/eshell/esh-proc.el   2013-02-08 15:47:07 +0000
+++ b/lisp/eshell/esh-proc.el   2013-05-23 04:57:27 +0000
@@ -25,9 +25,7 @@
 
 (provide 'esh-proc)
 
-(eval-when-compile
-  (require 'eshell)
-  (require 'esh-util))
+(require 'esh-cmd)
 
 (defgroup eshell-proc nil
   "When Eshell invokes external commands, it always does so

=== modified file 'lisp/eshell/esh-util.el'
--- a/lisp/eshell/esh-util.el   2013-01-17 10:01:33 +0000
+++ b/lisp/eshell/esh-util.el   2013-05-23 04:57:27 +0000
@@ -605,10 +605,16 @@
     (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)

=== modified file 'lisp/eshell/esh-var.el'
--- a/lisp/eshell/esh-var.el    2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/esh-var.el    2013-05-23 04:57:27 +0000
@@ -107,11 +107,11 @@
 
 (provide 'esh-var)
 
-(eval-when-compile
-  (require 'pcomplete)
-  (require 'esh-util)
-  (require 'esh-mode))
+(require 'esh-util)
+(require 'esh-cmd)
 (require 'esh-opt)
+
+(require 'pcomplete)
 (require 'env)
 (require 'ring)
 

=== modified file 'lisp/eshell/eshell.el'
--- a/lisp/eshell/eshell.el     2013-01-01 09:11:05 +0000
+++ b/lisp/eshell/eshell.el     2013-05-23 04:57:27 +0000
@@ -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 @@
 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 @@
                                     (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