diff options
| author | Paul Eggert | 2012-10-10 13:09:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-10-10 13:09:47 -0700 |
| commit | 9fa1de305acd530060062a1470f3018de7937bb1 (patch) | |
| tree | bb182ee666aef3b52b046d56e10ab282cad65bc9 /src/process.c | |
| parent | e738ca5624ba0f3703095e0ad48b4ef7b97973bf (diff) | |
| download | emacs-9fa1de305acd530060062a1470f3018de7937bb1.tar.gz emacs-9fa1de305acd530060062a1470f3018de7937bb1.zip | |
keyboard.c, keymap.c: Use bool for booleans.
* dispnew.c (sit_for): Distinguish between 3-way display_option
and boolean do_display.
* keyboard.c (single_kboard, this_command_key_count_reset)
(waiting_for_input, echoing, immediate_quit, input_pending)
(interrupt_input, interrupts_deferred, pop_kboard)
(temporarily_switch_to_single_kboard, ignore_mouse_drag_p)
(command_loop_1, adjust_point_for_property)
(safe_run_hooks_error, input_polling_used, read_char):
(help_char_p, readable_events, kbd_buffer_events_waiting)
(kbd_buffer_get_event, timer_check_2, make_lispy_event)
(lucid_event_type_list_p, get_input_pending):
(gobble_input, menu_separator_name_p, menu_bar_item)
(parse_menu_item, parse_tool_bar_item, read_char_x_menu_prompt)
(read_char_minibuf_menu_prompt, access_keymap_keyremap)
(keyremap_step, test_undefined, read_key_sequence)
(detect_input_pending, detect_input_pending_ignore_squeezables)
(detect_input_pending_run_timers, requeued_events_pending_p)
(quit_throw_to_read_char, Fset_input_interrupt_mode):
* keymap.c (get_keymap, keymap_parent, keymap_memberp)
(access_keymap_1, access_keymap, map_keymap, get_keyelt)
(Fdefine_key, Flookup_key, struct accessible_keymaps_data)
(accessible_keymaps_1, Fkey_description, push_key_description):
(shadow_lookup, struct where_is_internal_data)
(where_is_internal, Fwhere_is_internal, where_is_internal_1)
(Fdescribe_buffer_bindings, describe_map_tree, struct describe_map_elt)
(describe_map, describe_vector):
* menu.c (single_menu_item):
* nsmenu.m (ns_update_menubar):
* process.c (wait_reading_process_output):
* search.c (scan_buffer, scan_newline):
Use bool for boolean.
* keyboard.c (timers_run, swallow_events)
(detect_input_pending_run_timers):
* process.c (wait_reading_process_output):
Use unsigned for counter where wraparound-on-overflow is desired,
since unsigned is guaranteed to have that behavior and signed is not.
(read_char): Use ptrdiff_t for string length.
(get_input_pending): Remove first argument, since it was always
the same pointer-to-int (now pointer-to-boolean) &input_pending,
and behave as if it had that value. Return new value of
input_pending. All callers changed.
* keyboard.h (struct kboard): Use unsigned : 1 for boolean member
immediate_echo. Use ptrdiff_t for echo_after_prompt, since it's
a string length.
* keymap.c (push_key_description): Omit last arg, which was always 1.
All callers changed.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/process.c b/src/process.c index c941a196539..2cbce9d28ea 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4302,7 +4302,7 @@ wait_reading_process_output_1 (void) | |||
| 4302 | -1 meaning caller will actually read the input, so don't throw to | 4302 | -1 meaning caller will actually read the input, so don't throw to |
| 4303 | the quit handler, or | 4303 | the quit handler, or |
| 4304 | 4304 | ||
| 4305 | DO_DISPLAY != 0 means redisplay should be done to show subprocess | 4305 | DO_DISPLAY means redisplay should be done to show subprocess |
| 4306 | output that arrives. | 4306 | output that arrives. |
| 4307 | 4307 | ||
| 4308 | If WAIT_FOR_CELL is a cons cell, wait until its car is non-nil | 4308 | If WAIT_FOR_CELL is a cons cell, wait until its car is non-nil |
| @@ -4322,7 +4322,7 @@ wait_reading_process_output_1 (void) | |||
| 4322 | 4322 | ||
| 4323 | int | 4323 | int |
| 4324 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | 4324 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, |
| 4325 | int do_display, | 4325 | bool do_display, |
| 4326 | Lisp_Object wait_for_cell, | 4326 | Lisp_Object wait_for_cell, |
| 4327 | struct Lisp_Process *wait_proc, int just_wait_proc) | 4327 | struct Lisp_Process *wait_proc, int just_wait_proc) |
| 4328 | { | 4328 | { |
| @@ -4419,7 +4419,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4419 | 4419 | ||
| 4420 | do | 4420 | do |
| 4421 | { | 4421 | { |
| 4422 | int old_timers_run = timers_run; | 4422 | unsigned old_timers_run = timers_run; |
| 4423 | struct buffer *old_buffer = current_buffer; | 4423 | struct buffer *old_buffer = current_buffer; |
| 4424 | Lisp_Object old_window = selected_window; | 4424 | Lisp_Object old_window = selected_window; |
| 4425 | 4425 | ||
| @@ -4753,7 +4753,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4753 | 4753 | ||
| 4754 | if (read_kbd != 0) | 4754 | if (read_kbd != 0) |
| 4755 | { | 4755 | { |
| 4756 | int old_timers_run = timers_run; | 4756 | unsigned old_timers_run = timers_run; |
| 4757 | struct buffer *old_buffer = current_buffer; | 4757 | struct buffer *old_buffer = current_buffer; |
| 4758 | Lisp_Object old_window = selected_window; | 4758 | Lisp_Object old_window = selected_window; |
| 4759 | int leave = 0; | 4759 | int leave = 0; |
| @@ -6821,14 +6821,14 @@ extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *, | |||
| 6821 | see full version for other parameters. We know that wait_proc will | 6821 | see full version for other parameters. We know that wait_proc will |
| 6822 | always be NULL, since `subprocesses' isn't defined. | 6822 | always be NULL, since `subprocesses' isn't defined. |
| 6823 | 6823 | ||
| 6824 | DO_DISPLAY != 0 means redisplay should be done to show subprocess | 6824 | DO_DISPLAY means redisplay should be done to show subprocess |
| 6825 | output that arrives. | 6825 | output that arrives. |
| 6826 | 6826 | ||
| 6827 | Return true if we received input from any process. */ | 6827 | Return true if we received input from any process. */ |
| 6828 | 6828 | ||
| 6829 | int | 6829 | int |
| 6830 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | 6830 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, |
| 6831 | int do_display, | 6831 | bool do_display, |
| 6832 | Lisp_Object wait_for_cell, | 6832 | Lisp_Object wait_for_cell, |
| 6833 | struct Lisp_Process *wait_proc, int just_wait_proc) | 6833 | struct Lisp_Process *wait_proc, int just_wait_proc) |
| 6834 | { | 6834 | { |
| @@ -6904,7 +6904,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 6904 | 6904 | ||
| 6905 | do | 6905 | do |
| 6906 | { | 6906 | { |
| 6907 | int old_timers_run = timers_run; | 6907 | unsigned old_timers_run = timers_run; |
| 6908 | timer_delay = timer_check (); | 6908 | timer_delay = timer_check (); |
| 6909 | if (timers_run != old_timers_run && do_display) | 6909 | if (timers_run != old_timers_run && do_display) |
| 6910 | /* We must retry, since a timer may have requeued itself | 6910 | /* We must retry, since a timer may have requeued itself |