2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8914c65e41f..147ba58dd69 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xterm.c b/src/xterm.c
index 635ba643035..2c6cb44d159 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6305,6 +6305,11 @@ handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish)
                                   &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)