[cells-cvs] CVS Celtk

[fgoenninger]

Update of /project/cells/cvsroot/Celtk
In directory clnet:/tmp/cvs-serv18944

Modified Files:
	Celtk.lisp 
Log Message:
Commented out debug stuff in tk-format-now.
Added Header info tag at beginning of file.

--- /project/cells/cvsroot/Celtk/Celtk.lisp	2006/05/28 15:34:27	1.26
+++ /project/cells/cvsroot/Celtk/Celtk.lisp	2006/05/28 23:45:03	1.27
@@ -16,6 +16,7 @@
 
 |#
 
+;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.27 2006/05/28 23:45:03 fgoenninger Exp $
 
 (defpackage :celtk
   (:nicknames "CTK")
@@ -133,6 +134,16 @@
       ;
       ; --- debug stuff ---------------------------------
       ;
+<<<<<<< Celtk.lisp
+;;       (let ((yes '( "insert" "end"))
+;;             (no  '()))
+;;         (declare (ignorable yes no))
+;;         (when (and (find-if (lambda (s) (search s tk$)) yes)
+;;                    (not (find-if (lambda (s) (search s tk$)) no)))
+;;           (format t "~&tk> ~a~%" tk$))
+;; 	  (break))
+;;       (assert *tki*)
+=======
       (let ((yes '( "insert"))
             (no  '()))
         (declare (ignorable yes no))
@@ -140,6 +151,7 @@
                         (not (find-if (lambda (s) (search s tk$)) no)))
           (format t "~&tk> ~a~%" tk$)))
       (assert *tki*)
+>>>>>>> 1.26
       ; --- end debug stuff ------------------------------
       ;
       ; --- serious stuff ---