Require individual files if needed when compiling, rather than

esh-maint.  Collect any require statements.  Move provide statement to
end.  Move any commentary to start.

1 files changed, 10 insertions, 9 deletions

diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index b4d65fa1f5e..a8e029b629c 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -22,15 +22,6 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(provide 'esh-test)
-
-(eval-when-compile (require 'esh-maint))
-
-(defgroup eshell-test nil
-  "This module is meant to ensure that Eshell is working correctly."
-  :tag "Eshell test suite"
-  :group 'eshell)
-
 ;;; Commentary:
 
 ;; The purpose of this module is to verify that Eshell works as
@@ -39,8 +30,16 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'eshell)
+  (require 'esh-util))
 (require 'esh-mode)
 
+(defgroup eshell-test nil
+  "This module is meant to ensure that Eshell is working correctly."
+  :tag "Eshell test suite"
+  :group 'eshell)
+
 ;;; User Variables:
 
 (defface eshell-test-ok
@@ -236,5 +235,7 @@
                  "\n"))))
             nil t))
 
+(provide 'esh-test)
+
 ;;; arch-tag: 6e32275a-8285-4a4e-b7cf-819aa7c86b8e
 ;;; esh-test.el ends here