# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1200583362 0
# Node ID b508fea5860e73d71b5a06f3e8c04b60d459c82b
# Parent  a8237408c2217bb76f9a4af0508529e36031fed7
(handle_one_xevent): Revert to counting chars not bytes.
(XTread_socket): Clarify what return value is counting in comment.

diff -r a8237408c221 -r b508fea5860e src/xterm.c
--- a/src/xterm.c	Thu Jan 17 12:48:41 2008 +0000
+++ b/src/xterm.c	Thu Jan 17 15:22:42 2008 +0000
@@ -6488,9 +6488,7 @@
 		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.  */
 
@@ -6989,7 +6987,9 @@
    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.  */