[Emacs-diffs] Changes to emacs/lisp/eshell/eshell.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/05 07:07:40

Index: eshell.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/eshell.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- eshell.el   27 Nov 2007 04:12:21 -0000      1.28
+++ eshell.el   5 Dec 2007 07:07:39 -0000       1.29
@@ -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'."