From fe18870bca32972dc910927c7f63581fa8fcef80 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 13 Jun 2002 13:42:24 +0000 Subject: [PATCH] *** empty log message *** --- src/ChangeLog | 4 ++++ src/xterm.c | 13 +------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8c8454dfe47..0bc50ad997f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-06-13 Stefan Monnier + + * xterm.c (XTread_socket): Always decode X*LookupString's output. + 2002-06-05 Eli Zaretskii * window.c (Fset_window_hscroll): Doc fix. diff --git a/src/xterm.c b/src/xterm.c index 94b14da9695..9c86139ecb2 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10561,19 +10561,8 @@ XTread_socket (sd, bufp, numchars, expected) temp_buffer[temp_index++] = copy_bufptr[i]; } - if (/* If the event is not from XIM, */ - event.xkey.keycode != 0 - /* or the current locale doesn't request - decoding of the intup data, ... */ - || coding.type == coding_type_raw_text - || coding.type == coding_type_no_conversion) - { - /* ... we can use the input data as is. */ - nchars = nbytes; - } - else { - /* We have to decode the input data. */ + /* Decode the input data. */ int require; unsigned char *p; -- 2.39.5