*** empty log message ***

3 files changed, 69 insertions, 1 deletions

diff --git a/info/.gitignore b/info/.gitignore
index 43f0fcfdea6..3266686b77c 100644
--- a/info/.gitignore
+++ b/info/.gitignore
@@ -31,10 +31,12 @@ emacs-29
 emacs-30
 emacs-31
 emacs-32
+emacs-33
 ccmode
 ccmode-1
 ccmode-2
 ccmode-3
+ccmode-4
 cl
 cl-1
 cl-2
@@ -77,6 +79,7 @@ reftex-1
 reftex-2
 reftex-3
 reftex-4
+reftex-5
 sc
 sc-1
 sc-2
@@ -92,4 +95,14 @@ viper-4
 viper-5
 widget
 ada-mode
-
+eudc
+autotype
+efaq
+efaq-1
+efaq-2
+efaq-3
+efaq-4
+efaq-5
+idlwave
+idlwave-1
+idlwave-2
diff --git a/man/ChangeLog b/man/ChangeLog
index e649908587c..b6ece7ee231 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2000-01-13  Gerd Moellmann  <gerd@gnu.org>
+
+        * eudc.texi: New file based on EUDC 1.30b.
+
+        * Makefile.in (INFO_TARGETS): Add eudc.
+        (DVI_TARGETS): Add eudc.dvi
+        (../info/eudc, eudc.dvi): New targets.
+
 2000-01-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * Makefile.in (INFO_TARGETS): Rename emacs-faq to efaq (for
diff --git a/src/ChangeLog b/src/ChangeLog
index 81b4e6e8101..9c38c746acb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,50 @@
+2000-01-29  Gerd Moellmann  <gerd@gnu.org>
+
+        * xfns.c (xic_set_preeditarea): Take window parameter and
+        window-relative pixel-positions.
+
+        * xterm.c (x_display_cursor): Set XIC pre-edit area only if window
+        is its frame's selected window.
+        (xim_instantiate_callback): Likewise.
+
+        * xfns.c (x_create_im): Removed.
+        (DEFAULT_STYLE, DEFAULT_FONT): Removed.
+        (supported_xim_styles): Renamed from supported_styles.
+        (best_xim_style): Renamed from best_style.
+        (create_frame_xic): Renamed from xic_create_frame.
+        (free_frame_xic): Renamed from xic_destroy_frame.
+        
+2000-01-29  INOUE Seiichiro <inoue@ainet.or.jp>
+
+        * xterm.c (XTread_socket) [HAVE_X_I18N]: If event is for none of
+        our frames, call XFilterEvent with 2nd parameter `None'.
+        (XTread_socket) <KeyPress> [HAVE_X_I18N]: Handle XmbLookupString
+        returning XBufferOverflow.
+        (XTread_socket) <ConfigureNotify> [HAVE_X_I18N]: Set XIC status
+        area.
+        (x_display_cursor) [HAVE_X_I18N]: Set XIC pre-edit area.
+        (x_new_fontset) [HAVE_X_I18N]: Create XIC status area fontset.
+        (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback)
+        (xim_initialize, xim_close)
+        [HAVE_X_I18N && HAVE_X11R6]: New functions.
+        (x_destroy_window) [HAVE_X_I18N]:  Call xic_destroy_frame.
+        (x_term_init) [HAVE_X_I18N]: Call xim_initialize.
+        (x_delete_display) [HAVE_X_I18N]: Call xim_close.
+
+        * xterm.h (struct x_display_info) [HAVE_X_I18N]: Add members `xim'
+        and `xim_styles'.
+        (struct x_output) [HAVE_X_I18N]: Remove member `xim', add
+        `xic_style' and `xic_xfs'.
+        (FRAME_MENUBAR_HEIGHT, FRAME_X_XIM, FRAME_X_XIM_STYLES)
+        (FRAME_XIC_STYLE, FRAME_XIC_FONTSET): New macros.
+        (FRAME_XIM): Removed.
+
+        * xfns.c (supported_styles): New variable.
+        (DEFAULT_STYLE, DEFAULT_FONT): New macros
+        (xic_create_xfontset, best_style, xic_create_frame)
+        (xic_destroy_frame, xic_set_preeditarea, xic_set_statusarea)
+        (xic_set_xfontset): New functions.
+
 2000-01-28  Dave Love  <fx@gnu.org>
 
         * s/irix6-5.h: Revert last change after change to irix5-0.h.