comparison 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
comparison
equal deleted inserted replaced
87902:2080d155f7aa 87903:5d58981e6690
6556 inev.ie.code = c; 6556 inev.ie.code = c;
6557 kbd_buffer_store_event_hold (&inev.ie, hold_quit); 6557 kbd_buffer_store_event_hold (&inev.ie, hold_quit);
6558 } 6558 }
6559 } 6559 }
6560 6560
6561 /* Previous code updated count by nchars rather than nbytes, 6561 count += nchars;
6562 but that seems bogus to me. ++kfs */
6563 count += nbytes;
6564 6562
6565 inev.ie.kind = NO_EVENT; /* Already stored above. */ 6563 inev.ie.kind = NO_EVENT; /* Already stored above. */
6566 6564
6567 if (keysym == NoSymbol) 6565 if (keysym == NoSymbol)
6568 break; 6566 break;
7055 /* Read events coming from the X server. 7053 /* Read events coming from the X server.
7056 This routine is called by the SIGIO handler. 7054 This routine is called by the SIGIO handler.
7057 We return as soon as there are no more events to be read. 7055 We return as soon as there are no more events to be read.
7058 7056
7059 We return the number of characters stored into the buffer, 7057 We return the number of characters stored into the buffer,
7060 thus pretending to be `read'. 7058 thus pretending to be `read' (except the characters we store
7059 in the keyboard buffer can be multibyte, so are not necessarily
7060 C chars).
7061 7061
7062 EXPECTED is nonzero if the caller knows input is available. */ 7062 EXPECTED is nonzero if the caller knows input is available. */
7063 7063
7064 static int 7064 static int
7065 XTread_socket (terminal, expected, hold_quit) 7065 XTread_socket (terminal, expected, hold_quit)