Mercurial > emacs
diff src/termhooks.h @ 83067:b44978264e1d
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-118
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-119
src/keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-120
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-107
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 28 Feb 2004 04:52:40 +0000 |
parents | a871be7b26a5 0827d50296b5 |
children | 4970ad4995f5 |
line wrap: on
line diff
--- a/src/termhooks.h Sat Feb 28 01:33:17 2004 +0000 +++ b/src/termhooks.h Sat Feb 28 04:52:40 2004 +0000 @@ -489,10 +489,11 @@ there is available input on at least one of the currently opened display devices -- but not necessarily on this device. Therefore, in most cases EXPECTED should be simply ignored. - */ + + XXX This documentation needs to be updated. */ int (*read_socket_hook) P_ ((struct display *display, - struct input_event *buf, - int size, int expected)); + int expected, + struct input_event *hold_quit)); /* Called when a frame's display becomes entirely up to date. */ void (*frame_up_to_date_hook) P_ ((struct frame *));