Index: modules/clx/mit-clx/clx.lisp
===================================================================
RCS file: /cvsroot/clisp/clisp/modules/clx/mit-clx/clx.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -b -r1.1 -r1.2
--- modules/clx/mit-clx/clx.lisp	2000/03/31 21:28:53	1.1
+++ modules/clx/mit-clx/clx.lisp	2001/06/07 17:33:39	1.2
@@ -141,6 +141,7 @@
 ;  (declare (type <mumble> <mumble>-1 <mumble>-2)
 ;	   (values boolean)))
 
+#-CLISP
 (deftype boolean () '(or null (not null)))
 
 (deftype card32 () '(unsigned-byte 32))
Index: modules/clx/mit-clx/dependent.lisp
===================================================================
RCS file: /cvsroot/clisp/clisp/modules/clx/mit-clx/dependent.lisp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -b -r1.2 -r1.3
--- modules/clx/mit-clx/dependent.lisp	2000/09/12 17:00:53	1.2
+++ modules/clx/mit-clx/dependent.lisp	2001/06/08 15:44:00	1.3
@@ -1269,13 +1269,12 @@
 	    t))))
 #+CLISP
 (defmacro conditional-store (place old-value new-value &environment env)
-  (multiple-value-bind (SM1 SM2 SM3 SM4 SM5) (get-setf-method place env)
+  (multiple-value-bind (SM1 SM2 SM3 SM4 SM5) (ext:get-setf-method place env)
     `(without-interrupts
        (let* ,(mapcar #'list SM1 SM2)
          (cond ((eq ,SM5 ,old-value)
                 (let ((,(first SM3) ,new-value)) ,SM4)
-                t
-) )  ) ) )     )
+                t))))))
 
 ;;;----------------------------------------------------------------------------
 ;;; IO Error Recovery
Index: modules/clx/mit-clx/manager.lisp
===================================================================
RCS file: /cvsroot/clisp/clisp/modules/clx/mit-clx/manager.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -b -r1.1 -r1.2
--- modules/clx/mit-clx/manager.lisp	2000/03/31 21:34:45	1.1
+++ modules/clx/mit-clx/manager.lisp	2001/06/08 17:06:43	1.2
@@ -725,7 +725,7 @@
 ;; In order to avoid having to pass positional parameters to set-cut-buffer,
 ;; We've got to do the following.  WHAT A PAIN...
 #-clx-ansi-common-lisp
-(define-setf-method cut-buffer (display &rest option-list)
+(define-setf-expander cut-buffer (display &rest option-list)
   (declare (dynamic-extent option-list))
   (do* ((options (copy-list option-list))
 	(option options (cddr option))
Index: modules/clx/mit-clx/package.lisp
===================================================================
RCS file: /cvsroot/clisp/clisp/modules/clx/mit-clx/package.lisp,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -w -b -r1.2 -r1.4
--- modules/clx/mit-clx/package.lisp	2001/04/20 17:26:55	1.2
+++ modules/clx/mit-clx/package.lisp	2001/06/11 15:27:02	1.4
@@ -14,15 +14,13 @@
 ;;; The CLtL way
 
 (defpackage :xlib (:use :lisp #+(and kcl clos-conditions) :conditions))
+(in-package :xlib)
 
 #+(and (or kcl ibcl) (not clx-ansi-common-lisp))
 (shadow
   '(
     rational
     ))
-
-#+clisp
-(shadow :boolean)
 
 #+(and lispm (not clx-ansi-common-lisp))
 (import
Index: modules/clx/mit-clx/resource.lisp
===================================================================
RCS file: /cvsroot/clisp/clisp/modules/clx/mit-clx/resource.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -b -r1.1 -r1.2
--- modules/clx/mit-clx/resource.lisp	2000/03/31 21:35:49	1.1
+++ modules/clx/mit-clx/resource.lisp	2001/06/08 17:06:43	1.2
@@ -685,7 +685,7 @@
     ;; First read the server defaults if present, otherwise from the default
     ;; resource file
     (if (get-property rootwin :RESOURCE_MANAGER)
-	(xlib:wm-resources rdb rootwin)
+	(wm-resources rdb rootwin)
       (let ((path (default-resources-pathname)))
 	(when (and path (probe-file path))
 	  (read-resources rdb path))))