*** empty log message ***

3 files changed, 29 insertions, 4 deletions

diff --git a/etc/NEWS b/etc/NEWS
index faeaa8de5c4..2f1cb9b7967 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,4 +1,4 @@
-GNU Emacs NEWS -- history of user-visible changes.  2001-03-15
+GNU Emacs NEWS -- history of user-visible changes.  2003-05-21
 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -88,6 +88,12 @@ See the files mac/README and mac/INSTALL for build instructions.
 
 * Changes in Emacs 21.4
 
+** The X resource useXIM can be used to turn off use of XIM, which may
+speed up Emacs with slow networking to the X server.
+
+** `describe-char' can show data from the Unicode database file.  See
+user option `unicode-data'.
+
 ** `undo-only' (bound to C-x U) does an undo which does not redo any
 previous undo.
 
@@ -1315,9 +1321,6 @@ on garbage collection.
 ** New function `decode-coding-inserted-region' decodes a region as if
 it is read from a file without decoding.
 
-** New function `optimize-char-coding-system-table' can be called
-after making changes to `char-coding-system-table'.
-
 ** New function `langinfo' accesses locale information.
 
 ** `save-selected-window' now saves and restores the selected window
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8b1a2778b9..04c8b488364 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-05-21  Dave Love  <fx@gnu.org>
+
+        * descr-text.el (unicodedata-file): New.
+        (unicode-data): New (adapted from unicode branch).
+        (describe-char): Use it.  Print char's unicode differently.  Avoid
+        elements with null cadr when formatting list.  Clarify error
+        message when used in Help buffer.
+        (button): Require when compiling.
+        (describe-char-after): Alias for obsolete command.
+
 2003-05-21  Nick Roberts  <nick@nick.uklinux.net>
 
         * gdb-ui.el (gud-gdba-command-name): Use -noasync option for Gdb
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.