Mercurial > emacs
diff src/xterm.c @ 87903:5d58981e6690
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 22 Jan 2008 23:53:46 +0000 |
parents | 107ccd98fa12 b508fea5860e |
children | c70e45a7acfd |
line wrap: on
line diff
--- a/src/xterm.c Tue Jan 22 15:44:14 2008 +0000 +++ b/src/xterm.c Tue Jan 22 23:53:46 2008 +0000 @@ -6558,9 +6558,7 @@ } } - /* 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. */ @@ -7057,7 +7055,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. */