aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorJuanma Barranquero2011-03-26 02:23:15 +0100
committerJuanma Barranquero2011-03-26 02:23:15 +0100
commitf868cd8a7186e86e4c9bbd52de2aca99fa94648f (patch)
treec861c3ee7b8fe1c1f12729faac4a8e08c0b5862c /src/keyboard.c
parentdc8026879ec33cfdcb47973ab7a3c14789c62aa6 (diff)
downloademacs-f868cd8a7186e86e4c9bbd52de2aca99fa94648f.tar.gz
emacs-f868cd8a7186e86e4c9bbd52de2aca99fa94648f.zip
src/*.h: Remove unused parameters and functions.
* keyboard.h (timer_check, show_help_echo): Remove unused parameters. * keyboard.c (timer_check): Remove parameter `do_it_now', unused since 1996-04-12T06:01:29Z!rms@gnu.org. (show_help_echo): Remove parameter `ok_to_overwrite_keystroke_echo', unused since 2008-04-19T19:30:53Z!monnier@iro.umontreal.ca. * keyboard.c (read_char): * w32menu.c (w32_menu_display_help): * xmenu.c (show_help_event, menu_help_callback): Adjust calls to `show_help_echo'. * gtkutil.c (xg_maybe_add_timer): * keyboard.c (readable_events): * process.c (wait_reading_process_output): * xmenu.c (x_menu_wait_for_event): Adjust calls to `timer_check'. * insdel.c (adjust_markers_gap_motion): Remove; no-op since 1998-01-02T21:29:48Z!rms@gnu.org. (gap_left, gap_right): Don't call it.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 6ce102c7d65..c4ef2795f6a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -351,7 +351,7 @@ Lisp_Object Qmenu_bar;
351Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void); 351Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void);
352Lisp_Object Fthis_command_keys (void); 352Lisp_Object Fthis_command_keys (void);
353Lisp_Object Qextended_command_history; 353Lisp_Object Qextended_command_history;
354EMACS_TIME timer_check (int do_it_now); 354EMACS_TIME timer_check (void);
355 355
356static void record_menu_key (Lisp_Object c); 356static void record_menu_key (Lisp_Object c);
357static int echo_length (void); 357static int echo_length (void);
@@ -2068,16 +2068,12 @@ make_ctrl_char (int c)
2068 the `display' property). POS is the position in that string under 2068 the `display' property). POS is the position in that string under
2069 the mouse. 2069 the mouse.
2070 2070
2071 OK_TO_OVERWRITE_KEYSTROKE_ECHO non-zero means it's okay if the help
2072 echo overwrites a keystroke echo currently displayed in the echo
2073 area.
2074
2075 Note: this function may only be called with HELP nil or a string 2071 Note: this function may only be called with HELP nil or a string
2076 from X code running asynchronously. */ 2072 from X code running asynchronously. */
2077 2073
2078void 2074void
2079show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object, 2075show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object,
2080 Lisp_Object pos, int ok_to_overwrite_keystroke_echo) 2076 Lisp_Object pos)
2081{ 2077{
2082 if (!NILP (help) && !STRINGP (help)) 2078 if (!NILP (help) && !STRINGP (help))
2083 { 2079 {
@@ -3007,7 +3003,7 @@ read_char (int commandflag, int nmaps, Lisp_Object *maps, Lisp_Object prev_event
3007 htem = Fcdr (htem); 3003 htem = Fcdr (htem);
3008 position = Fcar (htem); 3004 position = Fcar (htem);
3009 3005
3010 show_help_echo (help, window, object, position, 0); 3006 show_help_echo (help, window, object, position);
3011 3007
3012 /* We stopped being idle for this event; undo that. */ 3008 /* We stopped being idle for this event; undo that. */
3013 if (!end_time) 3009 if (!end_time)
@@ -3309,7 +3305,7 @@ static int
3309readable_events (int flags) 3305readable_events (int flags)
3310{ 3306{
3311 if (flags & READABLE_EVENTS_DO_TIMERS_NOW) 3307 if (flags & READABLE_EVENTS_DO_TIMERS_NOW)
3312 timer_check (1); 3308 timer_check ();
3313 3309
3314 /* If the buffer contains only FOCUS_IN_EVENT events, and 3310 /* If the buffer contains only FOCUS_IN_EVENT events, and
3315 READABLE_EVENTS_FILTER_EVENTS is set, report it as empty. */ 3311 READABLE_EVENTS_FILTER_EVENTS is set, report it as empty. */
@@ -4383,14 +4379,10 @@ timer_check_2 (void)
4383 Returns the time to wait until the next timer fires. 4379 Returns the time to wait until the next timer fires.
4384 If no timer is active, return -1. 4380 If no timer is active, return -1.
4385 4381
4386 As long as any timer is ripe, we run it. 4382 As long as any timer is ripe, we run it. */
4387
4388 DO_IT_NOW is now ignored. It used to mean that we should
4389 run the timer directly instead of queueing a timer-event.
4390 Now we always run timers directly. */
4391 4383
4392EMACS_TIME 4384EMACS_TIME
4393timer_check (int do_it_now) 4385timer_check (void)
4394{ 4386{
4395 EMACS_TIME nexttime; 4387 EMACS_TIME nexttime;
4396 4388