changeset 87083:52787def92eb

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. (eshell-buffer-name): Define for compiler.
author Glenn Morris <rgm@gnu.org>
date Wed, 05 Dec 2007 07:07:39 +0000
parents 7a4a3f1c72ee
children c7c065bc43a2
files lisp/eshell/eshell.el
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/eshell/eshell.el	Wed Dec 05 07:07:12 2007 +0000
+++ b/lisp/eshell/eshell.el	Wed Dec 05 07:07:39 2007 +0000
@@ -224,9 +224,11 @@
 ;; will only have to read in this one file, which will greatly speed
 ;; things up.
 
-(require 'esh-mode)
+(eval-when-compile
+  (require 'cl)
+  (require 'esh-util))
 (require 'esh-util)
-(eval-when-compile (require 'esh-maint))
+(require 'esh-mode)
 
 (defgroup eshell nil
   "Eshell is a command shell implemented entirely in Emacs Lisp.  It
@@ -243,6 +245,7 @@
 ;;;_* User Options
 ;;
 ;; The following user options modify the behavior of Eshell overall.
+(defvar eshell-buffer-name)
 
 (defsubst eshell-add-to-window-buffer-names ()
   "Add `eshell-buffer-name' to `same-window-buffer-names'."