Mercurial > emacs
diff src/keyboard.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 | c4d4cbf86260 fe5d50158fb4 |
| children | 4e92102a0172 |
line wrap: on
line diff
--- a/src/keyboard.h Sat Feb 28 01:33:17 2004 +0000 +++ b/src/keyboard.h Sat Feb 28 04:52:40 2004 +0000 @@ -329,19 +329,21 @@ extern void timer_stop_idle P_ ((void)); extern int lucid_event_type_list_p P_ ((Lisp_Object)); extern void kbd_buffer_store_event P_ ((struct input_event *)); +extern void kbd_buffer_store_event_hold P_ ((struct input_event *, + struct input_event *)); #ifdef POLL_FOR_INPUT extern void poll_for_input_1 P_ ((void)); #endif extern void show_help_echo P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, int)); -extern int gen_help_event P_ ((struct input_event *, int, Lisp_Object, - Lisp_Object, Lisp_Object, Lisp_Object, int)); +extern void gen_help_event P_ ((Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, int)); extern void kbd_buffer_store_help_event P_ ((Lisp_Object, Lisp_Object)); extern Lisp_Object menu_item_eval_property P_ ((Lisp_Object)); extern int kbd_buffer_events_waiting P_ ((int)); -extern int tty_read_avail_input P_ ((struct display *, - struct input_event *, int, int)); +extern int tty_read_avail_input P_ ((struct display *, int, + struct input_event *)); /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 (do not change this comment) */