(XTread_socket) <KeyPress>: Don't use

STRING_CHAR_AND_LENGTH if nchars == nbytes.  From Kenichi Handa
<handa@etl.go.jp>.

diff --git a/src/xterm.c b/src/xterm.c
index d18f671a108eece564756e8c1b5fd46548957cd8..8399f8b6c1a90f919dffdce869912f7895075fb5 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10578,8 +10578,12 @@ XTread_socket (sd, bufp, numchars, expected)
                             character events.  */
                          for (i = 0; i < nbytes; i += len)
                            {
-                             c = STRING_CHAR_AND_LENGTH (copy_bufptr + i,
-                                                         nbytes - i, len);
+                             if (nchars == nbytes)
+                               c = copy_bufptr[i], len = 1;
+                             else
+                               c = STRING_CHAR_AND_LENGTH (copy_bufptr + i,
+                                                           nbytes - i, len);
+                             
                              bufp->kind = (SINGLE_BYTE_CHAR_P (c)
                                            ? ascii_keystroke
                                            : multibyte_char_keystroke);