*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c8454dfe471c90287f06d3fdf5357cd875a252c..0bc50ad997fefd1aaf83f889abfb5f622c84c3bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * xterm.c (XTread_socket): Always decode X*LookupString's output.
+
 2002-06-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * window.c (Fset_window_hscroll): Doc fix.

diff --git a/src/xterm.c b/src/xterm.c
index 94b14da9695ddf3a8d86c7f42997a43f1fd3edf3..9c86139ecb2ea1bd0718d26359ab2ea12d1e7d85 100644 (file)
--- 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;