# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1074248514 0
# Node ID e3e8f1dcc8958754df3f6e2cdcac40a5ad2485af
# Parent  7ea1b7196d49af4ed2b26b5ea2dea5c0d692a73e
* xterm.c (handle_one_xevent): Don't handle characters that are part
  of an old style (XLookupString) compose sequence.

diff -r 7ea1b7196d49 -r e3e8f1dcc895 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 16 01:48:11 2004 +0000
+++ b/src/ChangeLog	Fri Jan 16 10:21:54 2004 +0000
@@ -1,3 +1,8 @@
+2004-01-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (handle_one_xevent): Don't handle characters that are part
+	of an old style (XLookupString) compose sequence.
+
 2004-01-15  Kenichi Handa  <handa@m17n.org>
 
 	* search.c (Freplace_match): Use make_multibyte_string or
diff -r 7ea1b7196d49 -r e3e8f1dcc895 src/xterm.c
--- a/src/xterm.c	Fri Jan 16 01:48:11 2004 +0000
+++ b/src/xterm.c	Fri Jan 16 10:21:54 2004 +0000
@@ -6305,6 +6305,11 @@
                                   &compose_status);
 #endif
 
+          /* If not using XIM/XIC, and a compose sequence is in progress,
+             we break here.  Otherwise, chars_matched is always 0.  */
+          if (compose_status.chars_matched > 0 && nbytes == 0)
+            break;
+
           orig_keysym = keysym;
 
           if (numchars > 1)