Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324

1 files changed, 4 insertions, 4 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 1c5daca6425..aea431ea3fa 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6776,9 +6776,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
                 kbd_buffer_store_event_hold (&inev.ie, hold_quit);
               }
 
-            /* Previous code updated count by nchars rather than nbytes,
-               but that seems bogus to me.  ++kfs  */
-            count += nbytes;
+            count += nchars;
 
             inev.ie.kind = NO_EVENT;  /* Already stored above.  */
 
@@ -7275,7 +7273,9 @@ x_dispatch_event (event, display)
    We return as soon as there are no more events to be read.
 
    We return the number of characters stored into the buffer,
-   thus pretending to be `read'.
+   thus pretending to be `read' (except the characters we store
+   in the keyboard buffer can be multibyte, so are not necessarily
+   C chars).
 
    EXPECTED is nonzero if the caller knows input is available.  */