Patch : CL:EVAL-WHEN - update to contemporary call form

Index: animals.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/animals.lisp,v
retrieving revision 2.11
diff -p -u -r2.11 animals.lisp
--- animals.lisp	27 Jan 2005 23:03:05 -0000	2.11
+++ animals.lisp	30 Jul 2006 05:15:18 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: animals.lisp,v 2.11 2005/01/27 23:03:05 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/animals.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `string-beg-with'
   (require :cllib-string (translate-logical-pathname "cllib:string"))
@@ -145,7 +145,7 @@ Returnes a fresh string."
 ;;; Network implementation
 ;;;
 
-(eval-when (compile load eval)  ; ACL: for `*root-node*'
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; ACL: for `*root-node*'
 (defclass node ()
   ((name :type symbol :accessor node-name :initarg name)
    (info :type simple-string :accessor node-info :initarg info)
Index: autoload.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/autoload.lisp,v
retrieving revision 1.13
diff -p -u -r1.13 autoload.lisp
--- autoload.lisp	7 Apr 2006 21:51:11 -0000	1.13
+++ autoload.lisp	30 Jul 2006 05:15:18 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: autoload.lisp,v 1.13 2006/04/07 21:51:11 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/autoload.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `skip-to-line', `timestamp'
   (require :cllib-fileio (translate-logical-pathname "cllib:fileio")))
Index: base.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/base.lisp,v
retrieving revision 2.19
diff -p -u -r2.19 base.lisp
--- base.lisp	27 Jan 2005 23:03:05 -0000	2.19
+++ base.lisp	30 Jul 2006 05:15:19 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: base.lisp,v 2.19 2005/01/27 23:03:05 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/base.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :port-ext (translate-logical-pathname "clocc:src;port;ext"))
   (require :port-sys (translate-logical-pathname "port:sys")))
 
Index: base64.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/base64.lisp,v
retrieving revision 2.3
diff -p -u -r2.3 base64.lisp
--- base64.lisp	9 Mar 2006 15:42:22 -0000	2.3
+++ base64.lisp	30 Jul 2006 05:15:20 -0000
@@ -8,7 +8,7 @@
 ;;; $Id: base64.lisp,v 2.3 2006/03/09 15:42:22 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/base64.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base")))
 
 (in-package :cllib)
Index: bookmark.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/bookmark.lisp,v
retrieving revision 1.2
diff -p -u -r1.2 bookmark.lisp
--- bookmark.lisp	2 Nov 2001 22:31:15 -0000	1.2
+++ bookmark.lisp	30 Jul 2006 05:15:21 -0000
@@ -8,7 +8,7 @@
 ;;; $Id: bookmark.lisp,v 1.2 2001/11/02 22:31:15 sds Exp $

 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/bookmark.lisp,v $

 

-(eval-when (compile load eval)

+(eval-when (:compile-toplevel :load-toplevel :execute)

   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))

   (require :cllib-url (translate-logical-pathname "clocc:src;cllib;url"))

   (require :cllib-card (translate-logical-pathname "clocc:src;cllib;card")))

Index: card.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/card.lisp,v
retrieving revision 2.15
diff -p -u -r2.15 card.lisp
--- card.lisp	27 Jan 2005 23:02:50 -0000	2.15
+++ card.lisp	30 Jul 2006 05:15:21 -0000
@@ -12,7 +12,7 @@
 ;;; $Id: card.lisp,v 2.15 2005/01/27 23:02:50 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/card.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
@@ -35,7 +35,7 @@
 ;;; {{{ definitions
 ;;;
 
-(eval-when (compile load eval)  ; CMUCL
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; CMUCL
 (defclass name ()
   ((first :type simple-string :initarg first :accessor name-first
           :documentation "the first name")
Index: check.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/check.lisp,v
retrieving revision 1.6
diff -p -u -r1.6 check.lisp
--- check.lisp	27 Jan 2005 23:02:50 -0000	1.6
+++ check.lisp	30 Jul 2006 05:15:22 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: check.lisp,v 1.6 2005/01/27 23:02:50 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/check.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `list-format', `mesg'
   (require :cllib-log (translate-logical-pathname "cllib:log"))
Index: clhs.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/clhs.lisp,v
retrieving revision 3.9
diff -p -u -r3.9 clhs.lisp
--- clhs.lisp	6 Dec 2005 20:55:19 -0000	3.9
+++ clhs.lisp	30 Jul 2006 05:15:24 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: clhs.lisp,v 3.9 2005/12/06 20:55:19 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/clhs.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
@@ -285,7 +285,7 @@
       (print (gtk:widget-style w))
       (gtk:event-loop))))
 
- (eval-when (compile load eval) (export '(gtk::signal-connect) :gtk))
+ (eval-when (:compile-toplevel :load-toplevel :execute) (export '(gtk::signal-connect) :gtk))
 
  (defun gtk:signal-connect (widget signal-name fun &optional (bla 0) (blu 0))
   (gtk:signal-connect-full
Index: closio.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/closio.lisp,v
retrieving revision 1.20
diff -p -u -r1.20 closio.lisp
--- closio.lisp	27 Jan 2005 23:02:50 -0000	1.20
+++ closio.lisp	30 Jul 2006 05:15:24 -0000
@@ -9,7 +9,7 @@
 ;;; $Id: closio.lisp,v 1.20 2005/01/27 23:02:50 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/closio.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `class-slot-list', `class-slot-initargs'
   (require :port-sys (translate-logical-pathname "clocc:src;port;sys")))
@@ -33,7 +33,7 @@ Acceptable values are:
 This variable should have the same value when reading and writing,
 otherwise you will probably get an error.")
 
-(eval-when (compile load eval)  ; CMUCL for `+clos-readtable+'
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; CMUCL for `+clos-readtable+'
 (defun read-object (st char arg)
   "Read an instance of a CLOS class printed as #[name{ slot val}]"
   (declare (ignore char arg))
Index: csv.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/csv.lisp,v
retrieving revision 2.19
diff -p -u -r2.19 csv.lisp
--- csv.lisp	13 Jul 2006 21:19:51 -0000	2.19
+++ csv.lisp	30 Jul 2006 05:15:25 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: csv.lisp,v 2.19 2006/07/13 21:19:51 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/csv.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `with-collect'
   (require :cllib-simple (translate-logical-pathname "cllib:simple"))
Index: cvs.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/cvs.lisp,v
retrieving revision 2.27
diff -p -u -r2.27 cvs.lisp
--- cvs.lisp	12 Dec 2005 16:33:17 -0000	2.27
+++ cvs.lisp	30 Jul 2006 05:15:27 -0000
@@ -10,7 +10,7 @@
 ;;; $Id: cvs.lisp,v 2.27 2005/12/12 16:33:17 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/cvs.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `string-beg-with', `substitute-subseq'
   (require :cllib-string (translate-logical-pathname "cllib:string"))
@@ -38,7 +38,7 @@
 ;; Sam Steingold fixed some bugs in 1998 and
 ;; converted to the generic function in 2000.
 
-(eval-when (compile load eval) (fmakunbound 'cvs-diff2patch))
+(eval-when (:compile-toplevel :load-toplevel :execute) (fmakunbound 'cvs-diff2patch))
 ;;;###autoload
 (defgeneric cvs-diff2patch (in out)
   (:documentation "Convert a CVS diff to a patchable diff.")
Index: data.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/data.lisp,v
retrieving revision 1.13
diff -p -u -r1.13 data.lisp
--- data.lisp	26 Jul 2006 17:05:18 -0000	1.13
+++ data.lisp	30 Jul 2006 05:15:28 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: data.lisp,v 1.13 2006/07/26 17:05:18 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/data.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `mdl'
   (require :cllib-math (translate-logical-pathname "cllib:math"))
Index: date.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/date.lisp,v
retrieving revision 2.35
diff -p -u -r2.35 date.lisp
--- date.lisp	6 Mar 2006 17:46:35 -0000	2.35
+++ date.lisp	30 Jul 2006 05:15:31 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: date.lisp,v 2.35 2006/03/06 17:46:35 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/date.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `skip-to-new'
   (require :cllib-simple (translate-logical-pathname "cllib:simple"))
@@ -370,7 +370,7 @@ You can disable Y2K fixing with (setf (f
 ;;; generic
 ;;;
 
-(eval-when (compile load eval) (fmakunbound 'date))
+(eval-when (:compile-toplevel :load-toplevel :execute) (fmakunbound 'date))
 (declaim (ftype date-f-t date))
 ;;;###autoload
 (defgeneric date (xx)
Index: datedl.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/datedl.lisp,v
retrieving revision 1.14
diff -p -u -r1.14 datedl.lisp
--- datedl.lisp	27 Jan 2005 23:02:49 -0000	1.14
+++ datedl.lisp	30 Jul 2006 05:15:34 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: datedl.lisp,v 1.14 2005/01/27 23:02:49 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/datedl.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
Index: doall.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/doall.lisp,v
retrieving revision 1.6
diff -p -u -r1.6 doall.lisp
--- doall.lisp	24 Sep 2002 16:35:34 -0000	1.6
+++ doall.lisp	30 Jul 2006 05:15:34 -0000
@@ -8,7 +8,7 @@
 ;;; $Id: doall.lisp,v 1.6 2002/09/24 16:35:34 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/doall.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   (require :monitor (translate-logical-pathname
                      "clocc:src;tools;metering;metering")))
Index: elisp.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/elisp.lisp,v
retrieving revision 2.13
diff -p -u -r2.13 elisp.lisp
--- elisp.lisp	24 Dec 2004 19:35:14 -0000	2.13
+++ elisp.lisp	30 Jul 2006 05:15:36 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: elisp.lisp,v 2.13 2004/12/24 19:35:14 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/elisp.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `make-clos-readtable'
   (require :cllib-closio (translate-logical-pathname "cllib:closio"))
@@ -51,7 +51,7 @@
 ;;; Read Emacs-Lisp objects
 ;;;
 
-(eval-when (compile load eval)  ; CMUCL for `+elisp-readtable+'
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; CMUCL for `+elisp-readtable+'
 (defun el::read-elisp-special (stream char)
   (declare (stream stream) (character char))
   (ecase char
@@ -165,7 +165,7 @@
   `(defvar ,name ,val ,doc))
 (defmacro el::defconst (name val doc) `(defconstant ,name ,val ,doc))
 (defmacro el::eval-when-compile (&rest body)
-  `(eval-when (compile load) ,@body))
+  `(eval-when (:compile-toplevel :load-toplevel) ,@body))
 (defmacro el::setq-default (&rest body) `(setq ,@body))
 (defmacro el::save-window-excursion (&rest body) `(progn ,@body))
 (defmacro el::save-excursion (&rest body) `(progn ,@body))
Index: fileio.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/fileio.lisp,v
retrieving revision 1.41
diff -p -u -r1.41 fileio.lisp
--- fileio.lisp	27 Jan 2005 23:02:49 -0000	1.41
+++ fileio.lisp	30 Jul 2006 05:15:38 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: fileio.lisp,v 1.41 2005/01/27 23:02:49 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/fileio.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
@@ -30,7 +30,7 @@
 ;;; {{{ file misc
 ;;;
 
-(eval-when (compile load eval)  ; ACL
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; ACL
 (deftype file-size-t () '(unsigned-byte 32))
 )
 
Index: fin.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/fin.lisp,v
retrieving revision 2.9
diff -p -u -r2.9 fin.lisp
--- fin.lisp	27 Jan 2005 23:02:49 -0000	2.9
+++ fin.lisp	30 Jul 2006 05:15:39 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: fin.lisp,v 2.9 2005/01/27 23:02:49 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/fin.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `*num-tolerance*', `sqr', `cndf'
   (require :cllib-math (translate-logical-pathname "cllib:math"))
Index: geo.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/geo.lisp,v
retrieving revision 2.17
diff -p -u -r2.17 geo.lisp
--- geo.lisp	27 Jan 2005 23:02:49 -0000	2.17
+++ geo.lisp	30 Jul 2006 05:15:41 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: geo.lisp,v 2.17 2005/01/27 23:02:49 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/geo.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
Index: getopt.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/getopt.lisp,v
retrieving revision 2.4
diff -p -u -r2.4 getopt.lisp
--- getopt.lisp	27 Jan 2005 23:02:49 -0000	2.4
+++ getopt.lisp	30 Jul 2006 05:15:41 -0000
@@ -8,7 +8,7 @@
 ;;; $Id: getopt.lisp,v 2.4 2005/01/27 23:02:49 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/getopt.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `kwd'
   (require :cllib-symb (translate-logical-pathname "cllib:symb")))
Index: gnuplot.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/gnuplot.lisp,v
retrieving revision 3.29
diff -p -u -r3.29 gnuplot.lisp
--- gnuplot.lisp	26 Jul 2006 17:04:15 -0000	3.29
+++ gnuplot.lisp	30 Jul 2006 05:15:44 -0000
@@ -10,7 +10,7 @@
 ;;; the main entry point is WITH-PLOT-STREAM
 ;;; (see also other exported functions)
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `date2time', `+day-sec+', `days-between', `date>'
   (require :cllib-date (translate-logical-pathname "cllib:date"))
@@ -47,7 +47,7 @@
 This must be either a full path or a name of an executable in your PATH.")
 (defconst +gnuplot-epoch+ integer (encode-universal-time 0 0 0 1 1 2000 0)
   "*The gnuplot epoch - 2000-01-01.")
-(eval-when (compile load eval)  ; CMUCL
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; CMUCL
 (defcustom *gnuplot-printer* simple-string
   (format nil
           #+(or win32 mswindows) "//SEATTLE/4th Floor NE"
@@ -56,7 +56,7 @@ This must be either a full path or a nam
   "*The printer to print the plots."))
 (defcustom *gnuplot-stream* (or null stream) nil
   "The current gnuplot output stream.")
-(eval-when (compile load eval)  ; CMUCL
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; CMUCL
 (defcustom *gnuplot-file* pathname (merge-pathnames "plot.tmp" *datadir*)
   "*The tmp file for gnuplot."))
 (defcustom *gnuplot-msg-stream* (or stream null t) *standard-output*
Index: gq.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/gq.lisp,v
retrieving revision 2.34
diff -p -u -r2.34 gq.lisp
--- gq.lisp	27 Jan 2005 23:02:48 -0000	2.34
+++ gq.lisp	30 Jul 2006 05:15:47 -0000
@@ -9,7 +9,7 @@
 ;;; $Id: gq.lisp,v 2.34 2005/01/27 23:02:48 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/gq.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t', `whitespace-char-p'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
Index: h2lisp.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/h2lisp.lisp,v
retrieving revision 2.8
diff -p -u -r2.8 h2lisp.lisp
--- h2lisp.lisp	27 Jan 2005 23:02:47 -0000	2.8
+++ h2lisp.lisp	30 Jul 2006 05:15:48 -0000
@@ -9,7 +9,7 @@
 ;;; $Id: h2lisp.lisp,v 2.8 2005/01/27 23:02:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/h2lisp.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `text-stream'
   ;; (require :cllib-html (translate-logical-pathname "cllib:html"))
Index: html.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/html.lisp,v
retrieving revision 1.19
diff -p -u -r1.19 html.lisp
--- html.lisp	24 Sep 2002 17:38:18 -0000	1.19
+++ html.lisp	30 Jul 2006 05:15:49 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: html.lisp,v 1.19 2002/09/24 17:38:18 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/html.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   (require :port-gray (translate-logical-pathname "port:gray"))
   ;; `xml-read-comment'
Index: htmlgen.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/htmlgen.lisp,v
retrieving revision 1.20
diff -p -u -r1.20 htmlgen.lisp
--- htmlgen.lisp	27 Jan 2005 23:02:47 -0000	1.20
+++ htmlgen.lisp	30 Jul 2006 05:15:50 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: htmlgen.lisp,v 1.20 2005/01/27 23:02:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/htmlgen.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `dttm->string' - needed only for `directory-index'
   ;; (require :cllib-date (translate-logical-pathname "cllib:date"))
Index: inspect.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/inspect.lisp,v
retrieving revision 1.37
diff -p -u -r1.37 inspect.lisp
--- inspect.lisp	5 Dec 2005 15:16:08 -0000	1.37
+++ inspect.lisp	30 Jul 2006 05:15:52 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: inspect.lisp,v 1.37 2005/12/05 15:16:08 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/inspect.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `list-length-dotted'
   (require :cllib-simple (translate-logical-pathname "cllib:simple"))
Index: iter.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/iter.lisp,v
retrieving revision 1.10
diff -p -u -r1.10 iter.lisp
--- iter.lisp	29 Jun 2005 18:34:10 -0000	1.10
+++ iter.lisp	30 Jul 2006 05:15:53 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: iter.lisp,v 1.10 2005/06/29 18:34:10 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/iter.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `to-list'
   (require :cllib-simple (translate-logical-pathname "cllib:simple"))
Index: laser.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/laser.lisp,v
retrieving revision 1.5
diff -p -u -r1.5 laser.lisp
--- laser.lisp	27 Jan 2005 23:02:47 -0000	1.5
+++ laser.lisp	30 Jul 2006 05:15:54 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: laser.lisp,v 1.5 2005/01/27 23:02:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/laser.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; for `list-format'
   (require :cllib-log (translate-logical-pathname "cllib:log"))
Index: lift.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/lift.lisp,v
retrieving revision 2.7
diff -p -u -r2.7 lift.lisp
--- lift.lisp	11 Jul 2006 19:43:47 -0000	2.7
+++ lift.lisp	30 Jul 2006 05:15:56 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: lift.lisp,v 2.7 2006/07/11 19:43:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/lift.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `monotonic-p'
   (require :cllib-math (translate-logical-pathname "cllib:math"))
Index: list.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/list.lisp,v
retrieving revision 2.8
diff -p -u -r2.8 list.lisp
--- list.lisp	7 Apr 2006 18:29:27 -0000	2.8
+++ list.lisp	30 Jul 2006 05:15:57 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: list.lisp,v 2.8 2006/04/07 18:29:27 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/list.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `with-collect', `zero-len-p', `to-list', `filter'
   (require :cllib-simple (translate-logical-pathname "cllib:simple")))
Index: log.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/log.lisp,v
retrieving revision 1.29
diff -p -u -r1.29 log.lisp
--- log.lisp	27 Jan 2005 23:02:47 -0000	1.29
+++ log.lisp	30 Jul 2006 05:15:57 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: log.lisp,v 1.29 2005/01/27 23:02:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/log.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `with-type', `dfloat'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
Index: math.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/math.lisp,v
retrieving revision 2.82
diff -p -u -r2.82 math.lisp
--- math.lisp	30 Jun 2006 21:24:03 -0000	2.82
+++ math.lisp	30 Jul 2006 05:16:06 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: math.lisp,v 2.82 2006/06/30 21:24:03 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/math.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
Index: matrix.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/matrix.lisp,v
retrieving revision 2.26
diff -p -u -r2.26 matrix.lisp
--- matrix.lisp	22 Jun 2006 20:11:01 -0000	2.26
+++ matrix.lisp	30 Jul 2006 05:16:08 -0000
@@ -16,7 +16,7 @@
 ;;; $Id: matrix.lisp,v 2.26 2006/06/22 20:11:01 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/matrix.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `with-type', `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
Index: miscprint.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/miscprint.lisp,v
retrieving revision 1.20
diff -p -u -r1.20 miscprint.lisp
--- miscprint.lisp	23 Jan 2006 20:38:43 -0000	1.20
+++ miscprint.lisp	30 Jul 2006 05:16:10 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: miscprint.lisp,v 1.20 2006/01/23 20:38:43 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/miscprint.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `with-collect', `count-all'
   (require :cllib-simple (translate-logical-pathname "cllib:simple")))
Index: munkres.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/munkres.lisp,v
retrieving revision 2.7
diff -p -u -r2.7 munkres.lisp
--- munkres.lisp	12 Nov 2004 19:17:36 -0000	2.7
+++ munkres.lisp	30 Jul 2006 05:16:10 -0000
@@ -18,7 +18,7 @@
 ;;; $Id: munkres.lisp,v 2.7 2004/11/12 19:17:36 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/munkres.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base")))
 
 (in-package :cllib)
Index: octave.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/octave.lisp,v
retrieving revision 2.8
diff -p -u -r2.8 octave.lisp
--- octave.lisp	27 Jan 2005 23:02:47 -0000	2.8
+++ octave.lisp	30 Jul 2006 05:16:10 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: octave.lisp,v 2.8 2005/01/27 23:02:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/octave.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base")))
 
 (in-package :cllib)
Index: prompt.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/prompt.lisp,v
retrieving revision 2.12
diff -p -u -r2.12 prompt.lisp
--- prompt.lisp	27 Jan 2005 23:02:47 -0000	2.12
+++ prompt.lisp	30 Jul 2006 05:16:10 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: prompt.lisp,v 2.12 2005/01/27 23:02:47 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/prompt.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `getenv'
   (require :port-sys (translate-logical-pathname "port:sys")))
@@ -15,7 +15,7 @@
 (in-package :cllib)
 
 #+(and clisp lisp=cl)
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (let (s)
     (cond ((setq s (find-symbol "PACKAGE-SHORT-NAME" "EXT"))
            (import s "CLLIB"))
Index: rng.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/rng.lisp,v
retrieving revision 1.15
diff -p -u -r1.15 rng.lisp
--- rng.lisp	20 Apr 2005 18:12:56 -0000	1.15
+++ rng.lisp	30 Jul 2006 05:16:17 -0000
@@ -113,7 +113,7 @@
 ;;;;  Initial revision
 ;;;;
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `dfloat', `with-type'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype")))
@@ -142,7 +142,7 @@
           gen-poisson-variate))
 
 ;; CLOCC should not do this, IMO:
-;; (eval-when (compile)
+;; (eval-when (:compile-toplevel)
 ;;   (declaim (optimize (speed 3))))
 
 #+(and cmu negative-zero-is-not-zero)
@@ -1546,7 +1546,7 @@ order ORDER.
 	  (- (gen-gamma-variate-small-order r)
 	     (log x))))))
 
-(eval-when (compile eval)
+(eval-when (:compile-toplevel :execute)
   (defconstant +beta-algo-go+ 0.009572265238289d0)
   (declaim (type (double-float 0.009572265238289d0 0.009572265238289d0)
 		 +beta-algo-go+))
@@ -1801,7 +1801,7 @@ with parameters a and b:
 ;;; Binomial random variate
 
 #+(or)
-(eval-when (compile eval)
+(eval-when (:compile-toplevel :execute)
 (declaim (ftype (function ((and (integer 0) fixnum)
 			   (non-negative-float double-float 1d0)
 			   &optional random-state)
@@ -1855,7 +1855,7 @@ with parameters N and p:
 ;;; Poisson random variate
 
 #+(or)
-(eval-when (compile)
+(eval-when (:compile-toplevel)
   (declaim (ftype (function ((double-float 0d0) &optional random-state)
 			    (and (integer 0) fixnum))
 		  gen-poisson-variate)))
Index: rpm.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/rpm.lisp,v
retrieving revision 2.21
diff -p -u -r2.21 rpm.lisp
--- rpm.lisp	27 Jan 2005 23:02:46 -0000	2.21
+++ rpm.lisp	30 Jul 2006 05:16:20 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: rpm.lisp,v 2.21 2005/01/27 23:02:46 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/rpm.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `url' - generic function
   (require :cllib-url (translate-logical-pathname "cllib:url"))
@@ -171,7 +171,7 @@ Do not use it!!!  Use the generic functi
     (make-rpm :name (subseq name 0 p1) :vers (subseq name (1+ p1) p0)
               :rels (subseq name (1+ p0) p3) :arch (subseq name (1+ p3) p2))))
 
-(eval-when (compile load eval) (fmakunbound 'rpm))
+(eval-when (:compile-toplevel :load-toplevel :execute) (fmakunbound 'rpm))
 (defgeneric rpm (obj)
   (:documentation "Convert to RPM.")
   (:method ((obj rpm)) obj)
Index: server.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/server.lisp,v
retrieving revision 1.8
diff -p -u -r1.8 server.lisp
--- server.lisp	27 Jan 2005 23:02:46 -0000	1.8
+++ server.lisp	30 Jul 2006 05:16:21 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: server.lisp,v 1.8 2005/01/27 23:02:46 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/server.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `list-format'
   (require :cllib-log (translate-logical-pathname "cllib:log"))
Index: simple.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/simple.lisp,v
retrieving revision 1.15
diff -p -u -r1.15 simple.lisp
--- simple.lisp	28 Jan 2005 16:55:26 -0000	1.15
+++ simple.lisp	30 Jul 2006 05:16:21 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: simple.lisp,v 1.15 2005/01/28 16:55:26 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/simple.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base")))
 
 (in-package :cllib)
Index: sorted.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/sorted.lisp,v
retrieving revision 1.10
diff -p -u -r1.10 sorted.lisp
--- sorted.lisp	27 Jan 2005 23:02:46 -0000	1.10
+++ sorted.lisp	30 Jul 2006 05:16:23 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: sorted.lisp,v 1.10 2005/01/27 23:02:46 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/sorted.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `print-seqs', `comma'
   (require :cllib-tilsla (translate-logical-pathname "cllib:tilsla"))
Index: stat.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/stat.lisp,v
retrieving revision 1.17
diff -p -u -r1.17 stat.lisp
--- stat.lisp	7 Jul 2006 18:37:07 -0000	1.17
+++ stat.lisp	30 Jul 2006 05:16:24 -0000
@@ -8,7 +8,7 @@
 ;;; $Id: stat.lisp,v 1.17 2006/07/07 18:37:07 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/stat.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `mean', `divf', `dot', `d/', `incomplete-gamma', `approx=-abs'
   (require :cllib-math (translate-logical-pathname "cllib:math"))
Index: string.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/string.lisp,v
retrieving revision 1.12
diff -p -u -r1.12 string.lisp
--- string.lisp	6 Mar 2006 16:19:21 -0000	1.12
+++ string.lisp	30 Jul 2006 05:16:25 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: string.lisp,v 1.12 2006/03/06 16:19:21 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/string.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype")))
Index: symb.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/symb.lisp,v
retrieving revision 1.11
diff -p -u -r1.11 symb.lisp
--- symb.lisp	25 Jul 2005 16:22:52 -0000	1.11
+++ symb.lisp	30 Jul 2006 05:16:25 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: symb.lisp,v 1.11 2005/07/25 16:22:52 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/symb.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base")))
 
 (in-package :cllib)
Index: tests.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/tests.lisp,v
retrieving revision 2.42
diff -p -u -r2.42 tests.lisp
--- tests.lisp	22 Jun 2006 20:10:49 -0000	2.42
+++ tests.lisp	30 Jul 2006 05:16:27 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: tests.lisp,v 2.42 2006/06/22 20:10:49 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/tests.lisp,v $
 
-(eval-when (load compile eval)
+(eval-when (:load-toplevel :compile-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `mesg'
   (require :cllib-log (translate-logical-pathname "cllib:log"))
Index: tilsla.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/tilsla.lisp,v
retrieving revision 1.8
diff -p -u -r1.8 tilsla.lisp
--- tilsla.lisp	27 Jan 2005 23:02:46 -0000	1.8
+++ tilsla.lisp	30 Jul 2006 05:16:27 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: tilsla.lisp,v 1.8 2005/01/27 23:02:46 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/tilsla.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `dfloat'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype")))
Index: url.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/url.lisp,v
retrieving revision 2.59
diff -p -u -r2.59 url.lisp
--- url.lisp	23 Nov 2005 17:47:52 -0000	2.59
+++ url.lisp	30 Jul 2006 05:16:32 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: url.lisp,v 2.59 2005/11/23 17:47:52 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/url.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `index-t'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
@@ -240,7 +240,7 @@ guess from the protocol; save the guesse
     ("ftp" . :ftp) ("news" . :news) ("nntp" . :nntp))
   "*The alist of (\"string\" . protocol) to guess the protocol from the host.")
 
-(eval-when (compile load eval) (fmakunbound 'url))
+(eval-when (:compile-toplevel :load-toplevel :execute) (fmakunbound 'url))
 (declaim (ftype (function (t) url) url))
 ;;;###autoload
 (defgeneric url (xx)
Index: withtype.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/withtype.lisp,v
retrieving revision 1.8
diff -p -u -r1.8 withtype.lisp
--- withtype.lisp	27 Jan 2005 23:02:46 -0000	1.8
+++ withtype.lisp	30 Jul 2006 05:16:33 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: withtype.lisp,v 1.8 2005/01/27 23:02:46 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/withtype.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `mk-arr' [:ext is already required by :base anyway]
   (require :port-ext (translate-logical-pathname "port:ext")))
Index: xml.lisp
===================================================================
RCS file: /cvsroot/clocc/clocc/src/cllib/xml.lisp,v
retrieving revision 2.54
diff -p -u -r2.54 xml.lisp
--- xml.lisp	2 Sep 2005 16:01:26 -0000	2.54
+++ xml.lisp	30 Jul 2006 05:16:37 -0000
@@ -7,7 +7,7 @@
 ;;; $Id: xml.lisp,v 2.54 2005/09/02 16:01:26 sds Exp $
 ;;; $Source: /cvsroot/clocc/clocc/src/cllib/xml.lisp,v $
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (require :cllib-base (translate-logical-pathname "clocc:src;cllib;base"))
   ;; `+whitespace+', `whitespace-char-p'
   (require :cllib-withtype (translate-logical-pathname "cllib:withtype"))
@@ -177,7 +177,7 @@ If this is `:readably', print for the Li
            (format out "~s [~:d object~:p]"
                    (xml-misc-type xm) (length (xml-misc-data xm)))))))
 
-(eval-when (compile load eval)  ; ACL
+(eval-when (:compile-toplevel :load-toplevel :execute)  ; ACL
 (defcustom *xml-pre-namespaces* hash-table (make-hash-table :test 'equal)
   "The mapping from prefixes to namespaces.")