from trunk

[bpt/emacs.git] / src / keyboard.h

diff --git a/src/keyboard.h b/src/keyboard.h
index efc0546..27fc0e5 100644 (file)
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,6 +1,6 @@
 /* Declarations useful when processing input.
    Copyright (C) 1985, 1986, 1987, 1993, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -443,7 +443,7 @@ extern Lisp_Object Vfunction_key_map;
 /* Keymap of key translations that can override keymaps.  */
 extern Lisp_Object Vkey_translation_map;
 
-extern int parse_menu_item P_ ((Lisp_Object, int, int));
+extern int parse_menu_item (Lisp_Object, int);
 
 extern void echo_now P_ ((void));
 extern void init_kboard P_ ((KBOARD *));
@@ -484,10 +484,11 @@ extern void gen_help_event P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 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 void add_user_signals P_ ((int, const char *));
+extern void add_user_signal P_ ((int, const char *));
 
 extern int tty_read_avail_input P_ ((struct terminal *, int,
                                      struct input_event *));
+extern EMACS_TIME timer_check P_ ((int));
 
 /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3
    (do not change this comment) */