# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1196838041 0
# Node ID ad15f913bd02241c1875561e7b7b16800d0f908c
# Parent  ce46e8bcbccd1fe3a9f92a14b901434fd2cd5ac0
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.

diff -r ce46e8bcbccd -r ad15f913bd02 lisp/eshell/em-cmpl.el
--- a/lisp/eshell/em-cmpl.el	Wed Dec 05 07:00:23 2007 +0000
+++ b/lisp/eshell/em-cmpl.el	Wed Dec 05 07:00:41 2007 +0000
@@ -22,18 +22,6 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(provide 'em-cmpl)
-
-(eval-when-compile (require 'esh-maint))
-(require 'esh-util)
-
-(defgroup eshell-cmpl nil
-  "This module provides a programmable completion function bound to
-the TAB key, which allows for completing command names, file names,
-variable names, arguments, etc."
-  :tag "Argument completion"
-  :group 'eshell-module)
-
 ;;; Commentary:
 
 ;; Eshell, by using the pcomplete package, provides a full
@@ -82,6 +70,19 @@
 ;; This only works well if the completion function has provided Eshell
 ;; with sufficient pointers to locate the relevant help text.
 
+;;; Code:
+
+(eval-when-compile
+  (require 'eshell))
+(require 'esh-util)
+
+(defgroup eshell-cmpl nil
+  "This module provides a programmable completion function bound to
+the TAB key, which allows for completing command names, file names,
+variable names, arguments, etc."
+  :tag "Argument completion"
+  :group 'eshell-module)
+
 ;;; User Variables:
 
 (defcustom eshell-cmpl-load-hook '(eshell-cmpl-initialize)
@@ -448,7 +449,7 @@
 			(all-completions filename obarray 'functionp))
 		   completions)))))))
 
-;;; Code:
+(provide 'em-cmpl)
 
 ;;; arch-tag: 0e914699-673a-45f8-8cbf-82e1dbc571bc
 ;;; em-cmpl.el ends here