1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a41ae88614..ff2fddcb866 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-21  Dave Love  <fx@gnu.org>
+
+        [Merged from unicode branch.]
+
+        * xfns.c (x_window, x_window): Use use_xim.
+
+        * xterm.c (use_xim): Initialize.
+        (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
+        (x_term_init): Maybe set use_xim.
+
+        * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
+
 2003-05-21  Jason Rumney  <jasonr@gnu.org>
 
         * unexw32.c (_start): Remove _fmode initialization.