diff --git a/ChangeLog.n b/ChangeLog.n
index d113bd382b978a0eb9bde940e74d3e97654c6651..798733aaa7b7f472421bd4529c1836fc031f6568 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -10,6 +10,12 @@ If there are user-visible changes in this commit, then list the
 <standard changelog date stamp>
 	* <changes go here...>
 
+*******************************************************************************
+2000-01-31  Charles A. Cox  <cox@freezer>
+
+	* Makefile.defs: Build in euc locale.
+	* tk/macros.lisp: Use euc compatibility in xchar-code.
+
 *******************************************************************************
 2.2.2.7 -- join from acl50 branch
 
diff --git a/Makefile.defs b/Makefile.defs
index 516a15036e2964926195bf7fadd54e82e8a70857..17f3d91bec5f05ab3a8bc136df3ca1d2873e9061 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -1,4 +1,4 @@
-# $Id: Makefile.defs,v 1.49 1999/05/04 01:20:59 layer Exp $
+# $Id: Makefile.defs,v 1.50 2000/02/03 00:38:59 cox Exp $
 #
 #  Makefile.defs for CLIM 2.0
 
@@ -16,7 +16,7 @@ DCL	= dcli
 endif
 
 CL	= $(LISP) -I $(DCL)
-CLOPTS	= -qq -batch -backtrace-on-error
+CLOPTS	= -qq -batch -backtrace-on-error -locale japan.euc
 
 RM	= rm
 CAT	= cat
diff --git a/tk/macros.lisp b/tk/macros.lisp
index e51a00ade9cfe1497f8146124c521a49e071e45a..85417a8222d70f9d6e34905666205c012ff38e29 100644
--- a/tk/macros.lisp
+++ b/tk/macros.lisp
@@ -16,7 +16,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: macros.lisp,v 1.23 1999/02/25 08:23:42 layer Exp $
+;; $Id: macros.lisp,v 1.24 2000/02/03 00:39:00 cox Exp $
 
 (in-package :tk)
 
@@ -122,7 +122,12 @@
 
 (defmacro xchar-code (char)
   (clim-utils:with-gensyms (code)
-    `(let ((,code (char-code ,char)))
+    `(let ((,code (char-code
+		   (excl:ics-target-case
+		    (:+ics
+		     #+(version>= 6 0 :pre-alpha 19) (excl::process-code ,char)
+		     #-(version>= 6 0 :pre-alpha 19) ,char)
+		    (:-ics ,char)))))
        (excl:ics-target-case
 	(:+ics (logand ,code
 		       (if (logbitp 15 ,code)