diff --git a/ChangeLog.n b/ChangeLog.n
index 39d6e6bbd5242e629bf4cfdaa744adce24a95fc1..f6e5857a077f5c04d4117b9ff31bc4efd4902da0 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,13 @@
+Tue Nov 23 12:02:05 1993  Duane Rettig  (duane at clay)
+
+(for 4.2.devel.21 merge):
+
+	* climn-2.0/Makefile.hpprism: Add default for MAIN_OBJ
+
+	* clim-2.0/tk/xm-init.lisp: Change to initialization from georgej
+
+	* clim-2.0/demo/ico.lisp: Use excl::array-base instead of ah_data
+
 from cer: Tue Nov 23 11:57:29 PST 1993
 
 Makefile.defs		Make it point to dcl-devel
diff --git a/Makefile.generic b/Makefile.generic
index 2e9a1fc46a22356af766042e2bd5342cf5ea65b1..e78d53d34591eff36a09a1369c04ed17aef9110d 100644
--- a/Makefile.generic
+++ b/Makefile.generic
@@ -201,7 +201,7 @@ train-xm:	FORCE
 	(load \"misc/dev-load-1.lisp\") \
 	(load-it 'motif-clim :load-composer nil) \
 	$(TRAIN_LISP) \
-	(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
+	(clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
 	   $(CL) $(CLOPTS) -batch -backtrace-on-error
 
 train-ol:	FORCE
@@ -212,12 +212,12 @@ train-ol:	FORCE
 	(load \"misc/dev-load-1.lisp\") \
 	(load-it 'openlook-clim :load-composer nil) \
 	$(TRAIN_LISP) \
-	(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
+	(clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\")" | \
 	   $(CL) $(CLOPTS) -batch -backtrace-on-error
 
 generate_test_report:
 	@$(ECHO) "\
-	(clim-user::generate-pretty-test-report :file \"$(REPORT_FILE)\") \
+	(clim-test::generate-pretty-test-report :file \"$(REPORT_FILE)\") \
 	 (exit) \
 " | $(CLIM) $(CLOPTS) -batch -backtrace-on-error
 
@@ -228,7 +228,7 @@ profile	:	FORCE
 
 benchmark:
 	$(ECHO) "\
-	(clim-user::benchmark-clim $(BENCHMARK_FILE)) \
+	(clim-test::benchmark-clim $(BENCHMARK_FILE)) \
 "  | $(CLIM) $(CLOPTS) -batch -backtrace-on-error
 
 testps :
@@ -354,6 +354,10 @@ stub-x.c	:  $(UNDEFS) misc/make-stub-file
 stub-xt.c	:  $(XT_UNDEFS) misc/make-stub-file
 	misc/make-stub-file "void ___lisp_load_xt_stub ()"  $(XT_UNDEFS)  > stub-xt.c 
 
+# To keep make from complaining about syntax.  This is in the wrong place,
+# because the HOST defaults to sun4 always.
+MAIN_OBJ = mainxm.o
+
 include $(C_OBJECT_MAKEFILE)
 
 
diff --git a/Makefile.hpprism b/Makefile.hpprism
index 88b624abb079d2558085a217f39af9b01cc39b9b..bc51a83f7a08d1a17e6780dfa1981c22929b4ad2 100644
--- a/Makefile.hpprism
+++ b/Makefile.hpprism
@@ -26,4 +26,7 @@ CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS)
 CLIMFASLS= $(CLIM_XM_FASLS) $(CLIM_GENERIC_FASLS)
 INSTALLED_CLIMOBJS=$(GENERIC_PUBLIC_OBJS) $(XM_PUBLIC_OBJS) $(XM_LICENSED_OBJS)
 
+# To keep make from complaining about syntax:
+MAIN_OBJ = mainxm.o
+
 include Makefile.generic
diff --git a/demo/ico.lisp b/demo/ico.lisp
index 9669ebbc3854fc0667a0d3ba31108a59c70a2b49..bf6330e60dc7a9dc824fcc7c219ac7c54de12a9e 100644
--- a/demo/ico.lisp
+++ b/demo/ico.lisp
@@ -387,7 +387,7 @@
 (defun calculate-ico (ico-x ico-y do-edges do-faces edge-point-list face-point-list)
   (declare (integer ico-x ico-y)
 	   (optimize (safety 0) (speed 3)))
-  (let (#+allegro (v2-fill (cdr (excl::ah_data v2)))
+  (let (#+allegro (v2-fill (excl::array-base v2))
 	(v3-seq v3-seq)
 	(v2 v2)
 	(drawn drawn)
@@ -400,7 +400,7 @@
       #+allegro (simple-vector v2-fill))
 
     ;; Clear the drawn array
-    #+allegro (fill (cdr (excl::ah_data drawn-fill)) nil)
+    #+allegro (fill (excl::array-base drawn-fill) nil)
     #-allegro (fill drawn-fill nil)
 
     ;; Rotate vertices
diff --git a/tk/xm-init.lisp b/tk/xm-init.lisp
index 470bc72e1bddedf0cd37ce443e4d72757a11b067..578a24e88664ce2d995ce3b333704f6bb1ba3467 100644
--- a/tk/xm-init.lisp
+++ b/tk/xm-init.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: tk -*-
 ;;
-;;				-[Wed Sep 15 10:56:05 1993 by layer]-
+;;				-[Fri Nov 19 00:56:06 1993 by duane]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -35,7 +35,7 @@
 
 
 #+svr4
-(unless (ff::symbol-in-main-symbol-table-p "XCreateColormap")
+(unless (ff::symbol-in-main-symbol-table-p "xt_toolkit_initialize")
   (defun reinitialize-toolkit ()
     (xt_toolkit_initialize)
     (setup-error-handlers)