Index: packages.lisp
===================================================================
RCS file: /project/climacs/cvsroot/climacs/packages.lisp,v
retrieving revision 1.85
diff -u -r1.85 packages.lisp
--- packages.lisp	3 Mar 2006 19:38:57 -0000	1.85
+++ packages.lisp	25 Mar 2006 16:21:26 -0000
@@ -73,6 +73,7 @@
            #:upcase-word #:downcase-word #:capitalize-word
            #:tabify-region #:untabify-region
            #:indent-line
+           #:indent-region
            #:delete-indentation
            #:fill-line
 	   #:input-from-stream #:output-to-stream
@@ -161,32 +162,6 @@
 	   #:url
 	   #:climacs-textual-view #:+climacs-textual-view+))
 
-#-mcclim
-(defpackage :clim-extensions
-  (:use :clim-lisp :clim)
-  (:export
-   #:+blue-violet+
-   #:+dark-blue+
-   #:+dark-green+
-   #:+dark-violet+
-   #:+gray50+
-   #:+gray85+
-   #:+maroon+
-   #:+purple+))
-
-(defpackage :esa
-  (:use :clim-lisp :clim :clim-extensions)
-  (:export #:minibuffer-pane #:display-message
-	   #:esa-pane-mixin #:previous-command
-	   #:info-pane #:master-pane
-	   #:esa-frame-mixin #:windows #:recordingp #:executingp
-	   #:*numeric-argument-p* #:*current-gesture*
-	   #:esa-top-level #:simple-command-loop
-	   #:global-esa-table #:keyboard-macro-table
-	   #:help-table
-	   #:set-key
-	   #:find-applicable-command-table))
-
 (defpackage :climacs-gui
   (:use :clim-lisp :clim :climacs-buffer :climacs-base
 	:climacs-abbrev :climacs-syntax 
Index: climacs.asd
===================================================================
RCS file: /project/climacs/cvsroot/climacs/climacs.asd,v
retrieving revision 1.42
diff -u -r1.42 climacs.asd
--- climacs.asd	3 Mar 2006 19:38:57 -0000	1.42
+++ climacs.asd	25 Mar 2006 16:21:26 -0000
@@ -28,7 +28,7 @@
 (defparameter *climacs-directory* (directory-namestring *load-truename*))
 
 (defsystem :climacs
-  :depends-on (:mcclim :flexichain)
+  :depends-on (:mcclim :flexichain :esa)
   :components
   ((:module "cl-automaton"
 	    :components ((:file "automaton-package")
@@ -70,14 +70,12 @@
    (:file "prolog2paiprolog" :depends-on ("prolog-syntax"))
    (:file "ttcn3-syntax" :depends-on ("packages" "buffer" "syntax" "base"
 						 "pane"))
-   (:file "colors" :depends-on ("packages"))
    (:file "lisp-syntax" :depends-on ("packages" "syntax" "buffer" "base" "pane"
-						"gui" "colors"))
+						"gui"))
    (:file "lisp-syntax-commands" :depends-on ("lisp-syntax"))
-   (:file "esa" :depends-on ("packages" "colors"))
    (:file "gui" :depends-on ("packages" "syntax" "base" "buffer" "undo" "pane"
-                                        "esa" "kill-ring" "io" "text-syntax"
-					"abbrev" "colors"))
+                                        "kill-ring" "io" "text-syntax"
+					"abbrev" ))
 ;;    (:file "buffer-commands" :depends-on ("gui"))
    (:file "developer-commands" :depends-on ("gui" "lisp-syntax"))
    (:file "file-commands" :depends-on ("gui"))
@@ -85,7 +83,7 @@
    (:file "search-commands" :depends-on ("gui"))
    (:file "window-commands" :depends-on ("gui"))
    (:file "unicode-commands" :depends-on ("gui"))
-   (:file "slidemacs" :depends-on ("packages" "buffer" "syntax" "base" "pane" "colors"))
+   (:file "slidemacs" :depends-on ("packages" "buffer" "syntax" "base" "pane" ))
    (:file "slidemacs-gui" :depends-on ("packages" "slidemacs" "pane" "buffer" "syntax" "gui"))))
 
 (defsystem :climacs.tests
