*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 734e962a67eaf4131ec61366f0bf15ea7954ab2b..d72d7a916551e15a6e7e99331f67a96d10c12ec9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-09  Kim F. Storm  <storm@cua.dk>
+
+       * INSTALL (DETAILED BUILDING AND INSTALLATION): Describe new
+       functionality of --without-xim.
+
 2003-06-29  Dave Love  <fx@gnu.org>
 
        * configure.in: Fix XRegisterIMInstantiateCallback check for gcc.

diff --git a/etc/NEWS b/etc/NEWS
index d7bba6c3379dc71a0619ba58faa9a0c40cc8a964..c4dfab45598e4bc23f7ca5bc74712a4ac9045567 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -152,6 +152,9 @@ or when the frame is resized.
 ** 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.
 
+If the configure option `--without-xim' was used to turn off use of
+XIM by default, the X resource useXIM can be used to turn it on.
+
 ** `describe-char' can show data from the Unicode database file.  See
 user option `unicode-data'.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 78a73db5cc15b40f2652a7d6890e7e43155916f2..6bbc7842767277c70d348738ec7ae42d20bf1507 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * xterm.c (use_xim) [!USE_XIM]: Default to disable XIM if emacs
        was configured with --without-xim.
+       (x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
 
 2003-07-07  Richard M. Stallman  <rms@gnu.org>