diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-02-28 04:52:40 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-02-28 04:52:40 +0000 |
| commit | 057a9ab495a5fd334f9bd3c7704176502e5219c4 (patch) | |
| tree | a833e67f7903c9e091282644c54e1fa6a0abff3c /src/keyboard.h | |
| parent | ed62242d19b79fd8c14cd614ec6029e09d6e4618 (diff) | |
| parent | a874691c6cd8d74d0b51fae607b74543f1ffa1ca (diff) | |
| download | emacs-057a9ab495a5fd334f9bd3c7704176502e5219c4.tar.gz | |
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
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index a084efa7791..3f38b7ded6b 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -329,19 +329,21 @@ extern void timer_start_idle P_ ((void)); 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) */ |