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, 19 insertions, 16 deletions

diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 17d930a055d..b9642f41df6 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -22,18 +22,6 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(provide 'em-banner)
-
-(eval-when-compile (require 'esh-maint))
-
-(defgroup eshell-banner nil
-  "This sample module displays a welcome banner at login.
-It exists so that others wishing to create their own Eshell extension
-modules may have a simple template to begin with."
-  :tag "Login banner"
-  ;; :link '(info-link "(eshell)Login banner")
-  :group 'eshell-module)
-
 ;;; Commentary:
 
 ;; There is nothing to be done or configured in order to use this
@@ -51,6 +39,23 @@ modules may have a simple template to begin with."
 ;; In this case, it allows the user to change the string which
 ;; displays at login time.
 
+;;; Code:
+
+(eval-when-compile
+  (require 'cl)
+  (require 'esh-mode)
+  (require 'eshell))
+
+(require 'esh-util)
+
+(defgroup eshell-banner nil
+  "This sample module displays a welcome banner at login.
+It exists so that others wishing to create their own Eshell extension
+modules may have a simple template to begin with."
+  :tag "Login banner"
+  ;; :link '(info-link "(eshell)Login banner")
+  :group 'eshell-module)
+
 ;;; User Variables:
 
 (defcustom eshell-banner-message "Welcome to the Emacs shell\n\n"
@@ -61,10 +66,6 @@ This can be any sexp, and should end with at least two newlines."
 
 (put 'eshell-banner-message 'risky-local-variable t)
 
-;;; Code:
-
-(require 'esh-util)
-
 (defcustom eshell-banner-load-hook '(eshell-banner-initialize)
   "*A list of functions to run when `eshell-banner' is loaded."
   :type 'hook
@@ -90,5 +91,7 @@ This can be any sexp, and should end with at least two newlines."
     (goto-char (point-min))
     (looking-at msg)))
 
+(provide 'em-banner)
+
 ;;; arch-tag: e738b4ef-8671-42ae-a757-291779b92491
 ;;; em-banner.el ends here