aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2005-06-30 18:02:52 +0000
committerJan Djärv2005-06-30 18:02:52 +0000
commita6d0ae558ac9a0ebd3e084c883efdadcc00289a0 (patch)
tree455f9fb30058eee0eb84cb843e9a31f14fcf827f
parentf42e164952a255f64243dc5fea6db568f981b6eb (diff)
downloademacs-a6d0ae558ac9a0ebd3e084c883efdadcc00289a0.tar.gz
emacs-a6d0ae558ac9a0ebd3e084c883efdadcc00289a0.zip
* xterm.c (handle_one_xevent): bzero compose_status when nbytes
is not zero.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c3c6a80d49..3752b58c831 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-06-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): bzero compose_status when nbytes
4 is not zero.
5
12005-07-01 Masatake YAMATO <jet@gyve.org> 62005-07-01 Masatake YAMATO <jet@gyve.org>
2 7
3 * emacs.c (main): Passing ADD_NO_RANDOMIZE to 8 * emacs.c (main): Passing ADD_NO_RANDOMIZE to
diff --git a/src/xterm.c b/src/xterm.c
index cc76bae7dbf..ab299d1fa36 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6287,6 +6287,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
6287 if (compose_status.chars_matched > 0 && nbytes == 0) 6287 if (compose_status.chars_matched > 0 && nbytes == 0)
6288 break; 6288 break;
6289 6289
6290 bzero (&compose_status, sizeof (compose_status));
6290 orig_keysym = keysym; 6291 orig_keysym = keysym;
6291 6292
6292 /* Common for all keysym input events. */ 6293 /* Common for all keysym input events. */