Mercurial > hg > xemacs-beta
changeset 578:190b164ddcac
[xemacs-hg @ 2001-05-25 11:26:50 by ben]
device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix
the warnings, but not the right way. We are trying to eliminate
the raw use of `char' and `unsigned char' absolutely everywhere.
There is never an occasion to reintroduce these.
buffer.h: Instead, we fix these macros so they don't care about the type of
their lvalues. We already do this for the non-C-string
equivalents of these, and it's correct because it should be OK to
pass in an SBufbyte *, for example. In any case, we do not need
any type-correctness checking here -- errors will be caught for
sure as soon as we remove the -Wno-sign-compare switch.
mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ).
alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h:
Rename Error_behavior to Error_Behavior, to be consistent with
general naming practices (Lisp_Object, Char_Binary, etc.).
| author | ben |
|---|---|
| date | Fri, 25 May 2001 11:27:01 +0000 |
| parents | 910449c92002 |
| children | 0e1f61d4b978 |
| files | src/ChangeLog src/alloc.c src/buffer.h src/chartab.c src/console-gtk.c src/console-msw.c src/console-stream.c src/console-stream.h src/console-tty.c src/console-tty.h src/console-x.c src/console.c src/console.h src/device-msw.c src/device-x.c src/device.c src/eldap.c src/elhash.c src/emodules.c src/eval.c src/faces.c src/faces.h src/fns.c src/glyphs.c src/glyphs.h src/gui.c src/gui.h src/hpplay.c src/lisp.h src/lread.c src/mule-charset.c src/nt.c src/objects-gtk.c src/objects-gtk.h src/objects-msw.c src/objects-tty.c src/objects-x.c src/objects.c src/process-unix.c src/rangetab.c src/search.c src/sound.h src/specifier.c src/toolbar.c src/tooltalk.c src/win32.c src/window.c src/window.h |
| diffstat | 48 files changed, 356 insertions(+), 1073 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri May 25 10:04:29 2001 +0000 +++ b/src/ChangeLog Fri May 25 11:27:01 2001 +0000 @@ -1,3 +1,166 @@ +2001-05-25 Ben Wing <ben@xemacs.org> + + * device-msw.c (msprinter_default_printer): + * eldap.c (Fldap_open): + * emodules.c (emodules_load): + * hpplay.c (player_error_internal): + * process-unix.c (unix_canonicalize_host_name): + * process-unix.c (unix_open_network_stream): + * sound.h (sound_perror): + * sound.h (sound_warn): + * tooltalk.c (check_status): + * win32.c (tstr_to_local_file_format): + Revert Martin's attempted compile-warnings fix. It does fix + the warnings, but not the right way. We are trying to eliminate + the raw use of `char' and `unsigned char' absolutely everywhere. + There is never an occasion to reintroduce these. + + * buffer.h (DFC_C_STRING_ALLOCA_USE_CONVERTED_DATA): + * buffer.h (DFC_C_STRING_MALLOC_USE_CONVERTED_DATA): + Instead, we fix these macros so they don't care about the type of + their lvalues. We already do this for the non-C-string + equivalents of these, and it's correct because it should be OK to + pass in an SBufbyte *, for example. In any case, we do not need + any type-correctness checking here -- errors will be caught for + sure as soon as we remove the -Wno-sign-compare switch. + + * mule-charset.c (Fmake_charset): + Use invalid_argument, not generic signal_error (Qerror, ). + + * alloc.c: + * chartab.c (check_valid_char_table_value): + * chartab.c (chartab_type_validate): + * chartab.c (chartab_data_validate): + * console-gtk.c (gtk_device_to_console_connection): + * console-gtk.c (gtk_semi_canonicalize_console_connection): + * console-gtk.c (gtk_canonicalize_console_connection): + * console-gtk.c (gtk_semi_canonicalize_device_connection): + * console-gtk.c (gtk_canonicalize_device_connection): + * console-msw.c (mswindows_canonicalize_console_connection): + * console-msw.c (mswindows_canonicalize_device_connection): + * console-msw.c (msprinter_canonicalize_console_connection): + * console-msw.c (msprinter_canonicalize_device_connection): + * console-stream.c (stream_semi_canonicalize_console_connection): + * console-stream.c (stream_canonicalize_console_connection): + * console-stream.c (stream_semi_canonicalize_device_connection): + * console-stream.c (stream_canonicalize_device_connection): + * console-stream.h: + * console-tty.c (tty_semi_canonicalize_console_connection): + * console-tty.c (tty_canonicalize_console_connection): + * console-tty.c (tty_semi_canonicalize_device_connection): + * console-tty.c (tty_canonicalize_device_connection): + * console-tty.h: + * console-x.c (x_device_to_console_connection): + * console-x.c (x_semi_canonicalize_console_connection): + * console-x.c (x_canonicalize_console_connection): + * console-x.c (x_semi_canonicalize_device_connection): + * console-x.c (x_canonicalize_device_connection): + * console.c (decode_console_type): + * console.c (semi_canonicalize_console_connection): + * console.c (canonicalize_console_connection): + * console.h: + * console.h (struct console_methods): + * device-x.c (Fx_get_resource): + * device.c (semi_canonicalize_device_connection): + * device.c (canonicalize_device_connection): + * elhash.c (hash_table_size_validate): + * elhash.c (hash_table_weakness_validate): + * elhash.c (hash_table_test_validate): + * elhash.c (hash_table_rehash_size_validate): + * elhash.c (hash_table_rehash_threshold_validate): + * elhash.c (hash_table_data_validate): + * eval.c: + * eval.c (call_with_suspended_errors): + * eval.c (maybe_signal_error_1): + * eval.c (maybe_signal_continuable_error_1): + * eval.c (maybe_signal_error): + * eval.c (maybe_signal_continuable_error): + * eval.c (maybe_signal_error_2): + * eval.c (maybe_signal_continuable_error_2): + * eval.c (maybe_signal_ferror): + * eval.c (maybe_signal_continuable_ferror): + * eval.c (maybe_signal_ferror_with_frob): + * eval.c (maybe_signal_continuable_ferror_with_frob): + * eval.c (maybe_syntax_error): + * eval.c (maybe_sferror): + * eval.c (maybe_invalid_argument): + * eval.c (maybe_invalid_constant): + * eval.c (maybe_invalid_operation): + * eval.c (maybe_invalid_change): + * eval.c (maybe_invalid_state): + * faces.c (face_name_validate): + * faces.c (face_validate): + * faces.c (face_property_matching_instance): + * faces.h: + * fns.c (bad_bad_bunny): + * fns.c (bad_bad_turtle): + * fns.c (advance_plist_pointers): + * fns.c (external_plist_get): + * fns.c (external_plist_put): + * fns.c (external_remprop): + * glyphs.c (decode_device_ii_format): + * glyphs.c (decode_image_instantiator_format): + * glyphs.c (decode_image_instance_type): + * glyphs.c (decode_error_behavior_flag): + * glyphs.c (encode_error_behavior_flag): + * glyphs.c (Fmake_image_instance): + * glyphs.c (decode_glyph_type): + * glyphs.c (glyph_image_instance): + * glyphs.h: + * gui.c (gui_item_add_keyval_pair): + * gui.c (make_gui_item_from_keywords_internal): + * gui.h: + * lisp.h: + * lisp.h (error_behavior): + * lisp.h (_error_behavior_struct_): + * lisp.h (struct structure_keyword_entry): + * lisp.h (struct structure_type): + * lread.c (define_structure_type): + * lread.c (define_structure_type_keyword): + * nt.c (tty_semi_canonicalize_console_connection): + * nt.c (tty_canonicalize_console_connection): + * nt.c (tty_semi_canonicalize_device_connection): + * nt.c (tty_canonicalize_device_connection): + * objects-gtk.c (gtk_parse_nearest_color): + * objects-gtk.c (gtk_initialize_color_instance): + * objects-gtk.c (gtk_initialize_font_instance): + * objects-gtk.c (gtk_font_instance_truename): + * objects-gtk.h: + * objects-msw.c (mswindows_initialize_color_instance): + * objects-msw.c (initialize_font_instance): + * objects-msw.c (mswindows_initialize_font_instance): + * objects-msw.c (msprinter_initialize_font_instance): + * objects-msw.c (mswindows_font_instance_truename): + * objects-tty.c (tty_initialize_color_instance): + * objects-tty.c (tty_initialize_font_instance): + * objects-x.c (x_parse_nearest_color): + * objects-x.c (x_initialize_color_instance): + * objects-x.c (x_initialize_font_instance): + * objects-x.c (x_font_instance_truename): + * objects.c: + * objects.c (Fmake_font_instance): + * objects.c (font_instance_truename_internal): + * process-unix.c (get_internet_address): + * rangetab.c (rangetab_data_validate): + * search.c (compile_pattern_1): + * search.c (compile_pattern): + * search.c (fast_string_match): + * specifier.c (decode_specifier_type): + * specifier.c (check_valid_instantiator): + * specifier.c (check_valid_inst_list): + * specifier.c (check_valid_spec_list): + * specifier.c (check_valid_specifier_matchspec): + * specifier.c (specifier_instance_from_inst_list): + * specifier.c (specifier_instance): + * specifier.c (specifier_instance_no_quit): + * toolbar.c (check_toolbar_button_keywords): + * toolbar.c (Fcheck_toolbar_button_syntax): + * window.c (window_scroll): + * window.h: + + Rename Error_behavior to Error_Behavior, to be consistent with + general naming practices (Lisp_Object, Char_Binary, etc.). + 2001-05-24 Hrvoje Niksic <hniksic@arsdigita.com> * doprnt.c (emacs_doprnt_1): long_to_string doesn't return a @@ -71,885 +234,6 @@ Also remove audio: from error message. sound_warn and sound_perror prepends them. -2001-05-24 Ben Wing <ben@xemacs.org> - - * Makefile.in.in (objs): - * abbrev.c (syms_of_abbrev): - * alloc.c (memory_full): - * alloc.c (Fmake_byte_code): - * alloc.c (garbage_collect_1): - * buffer.c: - * buffer.c (print_buffer): - * buffer.c (nsberror): - * buffer.c (Fget_buffer_create): - * buffer.c (Fset_buffer): - * buffer.c (Fbury_buffer): - * buffer.c (syms_of_buffer): - * bytecode.c: - * bytecode.c (execute_optimized_program): - * bytecode.c (invalid_byte_code): - * bytecode.c (check_opcode): - * bytecode.c (check_constants_index): - * bytecode.c (READ_INSTRUCTION_CHAR): - * bytecode.c (optimize_byte_code): - * bytecode.c (Ffetch_bytecode): - * bytecode.c (syms_of_bytecode): - * callint.c (check_mark): - * callint.c (Fcall_interactively): - * callint.c (syms_of_callint): - * callproc.c: - * callproc.c (Fold_call_process_internal): - * callproc.c (child_setup): - * casetab.c (print_case_table): - * casetab.c (Fget_case_table): - * casetab.c (Fput_case_table): - * casetab.c (syms_of_casetab): - * chartab.c (symbol_to_char_table_type): - * chartab.c (decode_char_table_range): - * chartab.c (check_valid_char_table_value): - * chartab.c (chartab_data_validate): - * chartab.c (check_category_char): - * chartab.c (syms_of_chartab): - * cmdloop.c (command_loop_3): - * cmdloop.c (syms_of_cmdloop): - * cmds.c (Fdelete_char): - * cmds.c (Fself_insert_command): - * cmds.c (syms_of_cmds): - * console-msw.c: - * console-msw.c (mswindows_canonicalize_console_connection): - * console-msw.c (Fmswindows_message_box): - * console-msw.c (mswindows_lisp_error): - * console-msw.c (msprinter_canonicalize_console_connection): - * console-msw.c (syms_of_console_mswindows): - * console-msw.h: - * console-stream.c (stream_init_console): - * console-stream.c (stream_init_frame_1): - * console-tty.c (tty_init_console): - * console-tty.c (syms_of_console_tty): - * console-x.c (get_display_arg_connection): - * console.c (print_console): - * console.c (decode_console_type): - * console.c (Fselect_console): - * console.c (Fget_console): - * console.c (delete_console_internal): - * console.c (syms_of_console): - * data.c: - * data.c (dead_wrong_type_argument): - * data.c (c_write_error): - * data.c (lisp_write_error): - * data.c (args_out_of_range): - * data.c (args_out_of_range_3): - * data.c (print_weak_list): - * data.c (decode_weak_list_type): - * data.c (arith_error): - * data.c (init_errors_once_early): - * data.c (syms_of_data): - * database.c (CHECK_LIVE_DATABASE): - * database.c (print_database): - * database.c (finalize_database): - * database.c (Fopen_database): - * database.c (syms_of_database): - * debug.c (Fadd_debug_class_to_check): - * debug.c (Fdelete_debug_class_to_check): - * debug.c (Fset_debug_classes_to_check): - * debug.c (Fset_debug_class_types_to_check): - * debug.c (Fdebug_types_being_checked): - * debug.c (syms_of_debug): - * device-gtk.c (gtk_init_device): - * device-gtk.c (Fgtk_display_visual_class): - * device-gtk.c (Fgtk_keysym_on_keyboard_p): - * device-gtk.c (syms_of_device_gtk): - * device-msw.c (handle_devmode_changes): - * device-msw.c (mswindows_handle_print_dialog_box): - * device-msw.c (mswindows_handle_page_setup_dialog_box): - * device-msw.c (Fmsprinter_select_settings): - * device-msw.c (Fmsprinter_apply_settings): - * device-msw.c (print_devmode): - * device-tty.c (tty_init_device): - * device-tty.c (syms_of_device_tty): - * device-x.c (sanity_check_geometry_resource): - * device-x.c (x_init_device): - * device-x.c (x_get_resource_prefix): - * device-x.c (Fx_get_resource): - * device-x.c (Fx_put_resource): - * device-x.c (Fx_display_visual_class): - * device-x.c (Fx_keysym_hash_table): - * device-x.c (Fx_keysym_on_keyboard_p): - * device-x.c (Fx_get_font_path): - * device-x.c (syms_of_device_x): - * device.c (print_device): - * device.c (Fselect_device): - * device.c (Fset_device_selected_frame): - * device.c (Fget_device): - * device.c (Fmake_device): - * device.c (Fset_device_class): - * device.c (Fdevice_system_metric): - * device.c (Fdomain_device_type): - * device.c (syms_of_device): - * dialog-gtk.c (syms_of_dialog_gtk): - * dialog-msw.c (handle_file_dialog_box): - * dialog-msw.c (handle_question_dialog_box): - * dialog-msw.c (mswindows_make_dialog_box_internal): - * dialog-msw.c (syms_of_dialog_mswindows): - * dialog-x.c (dbox_descriptor_to_widget_value): - * dialog-x.c (x_make_dialog_box_internal): - * dialog.c (Fmake_dialog_box_internal): - * dired-msw.c (mswindows_get_files): - * dired-msw.c (syms_of_dired_mswindows): - * dired.c (Fdirectory_files): - * dired.c (file_name_completion): - * dired.c (syms_of_dired): - * doc.c (get_doc_string): - * doc.c (read_doc_string): - * doc.c (Fsnarf_documentation): - * doprnt.c (parse_off_posnum): - * doprnt.c (NEXT_ASCII_BYTE): - * doprnt.c (parse_doprnt_spec): - * doprnt.c (get_doprnt_args): - * doprnt.c (emacs_doprnt_1): - * dragdrop.c (syms_of_dragdrop): - * editfns.c (Fchar_to_string): - * editfns.c (region_limit): - * editfns.c (Fformat_time_string): - * editfns.c (Fdecode_time): - * editfns.c (Fencode_time): - * editfns.c (Ftranspose_regions): - * editfns.c (syms_of_editfns): - * eldap.c (signal_ldap_error): - * eldap.c (print_ldap): - * eldap.c (finalize_ldap): - * eldap.c (Fldap_open): - * eldap.c (Fldap_search_basic): - * eldap.c (Fldap_add): - * eldap.c (Fldap_modify): - * eldap.c (syms_of_eldap): - * eldap.h (CHECK_LIVE_LDAP): - * elhash.c (hash_table_size_validate): - * elhash.c (hash_table_weakness_validate): - * elhash.c (decode_hash_table_weakness): - * elhash.c (hash_table_test_validate): - * elhash.c (decode_hash_table_test): - * elhash.c (hash_table_rehash_size_validate): - * elhash.c (hash_table_rehash_threshold_validate): - * elhash.c (hash_table_data_validate): - * elhash.c (Fmake_hash_table): - * elhash.c (syms_of_elhash): - * emacs-widget-accessors.c (Fgtk_adjustment_lower): - * emacs-widget-accessors.c (Fgtk_adjustment_upper): - * emacs-widget-accessors.c (Fgtk_adjustment_value): - * emacs-widget-accessors.c (Fgtk_adjustment_step_increment): - * emacs-widget-accessors.c (Fgtk_adjustment_page_increment): - * emacs-widget-accessors.c (Fgtk_adjustment_page_size): - * emacs-widget-accessors.c (Fgtk_widget_style): - * emacs-widget-accessors.c (Fgtk_widget_window): - * emacs-widget-accessors.c (Fgtk_widget_state): - * emacs-widget-accessors.c (Fgtk_widget_name): - * emacs-widget-accessors.c (Fgtk_widget_parent): - * emacs-widget-accessors.c (Fgtk_button_child): - * emacs-widget-accessors.c (Fgtk_button_in_button): - * emacs-widget-accessors.c (Fgtk_button_button_down): - * emacs-widget-accessors.c (Fgtk_combo_entry): - * emacs-widget-accessors.c (Fgtk_combo_button): - * emacs-widget-accessors.c (Fgtk_combo_popup): - * emacs-widget-accessors.c (Fgtk_combo_popwin): - * emacs-widget-accessors.c (Fgtk_combo_list): - * emacs-widget-accessors.c (Fgtk_gamma_curve_table): - * emacs-widget-accessors.c (Fgtk_gamma_curve_curve): - * emacs-widget-accessors.c (Fgtk_gamma_curve_gamma): - * emacs-widget-accessors.c (Fgtk_gamma_curve_gamma_dialog): - * emacs-widget-accessors.c (Fgtk_gamma_curve_gamma_text): - * emacs-widget-accessors.c (Fgtk_check_menu_item_active): - * emacs-widget-accessors.c (Fgtk_notebook_tab_pos): - * emacs-widget-accessors.c (Fgtk_text_hadj): - * emacs-widget-accessors.c (Fgtk_text_vadj): - * emacs-widget-accessors.c (Fgtk_file_selection_dir_list): - * emacs-widget-accessors.c (Fgtk_file_selection_file_list): - * emacs-widget-accessors.c (Fgtk_file_selection_selection_entry): - * emacs-widget-accessors.c (Fgtk_file_selection_selection_text): - * emacs-widget-accessors.c (Fgtk_file_selection_main_vbox): - * emacs-widget-accessors.c (Fgtk_file_selection_ok_button): - * emacs-widget-accessors.c (Fgtk_file_selection_cancel_button): - * emacs-widget-accessors.c (Fgtk_file_selection_help_button): - * emacs-widget-accessors.c (Fgtk_file_selection_action_area): - * emacs-widget-accessors.c (Fgtk_font_selection_dialog_fontsel): - * emacs-widget-accessors.c (Fgtk_font_selection_dialog_main_vbox): - * emacs-widget-accessors.c (Fgtk_font_selection_dialog_action_area): - * emacs-widget-accessors.c (Fgtk_font_selection_dialog_ok_button): - * emacs-widget-accessors.c (Fgtk_font_selection_dialog_apply_button): - * emacs-widget-accessors.c (Fgtk_font_selection_dialog_cancel_button): - * emacs-widget-accessors.c (Fgtk_color_selection_dialog_colorsel): - * emacs-widget-accessors.c (Fgtk_color_selection_dialog_main_vbox): - * emacs-widget-accessors.c (Fgtk_color_selection_dialog_ok_button): - * emacs-widget-accessors.c (Fgtk_color_selection_dialog_reset_button): - * emacs-widget-accessors.c (Fgtk_color_selection_dialog_cancel_button): - * emacs-widget-accessors.c (Fgtk_color_selection_dialog_help_button): - * emacs-widget-accessors.c (Fgtk_dialog_vbox): - * emacs-widget-accessors.c (Fgtk_dialog_action_area): - * emacs-widget-accessors.c (Fgtk_input_dialog_close_button): - * emacs-widget-accessors.c (Fgtk_input_dialog_save_button): - * emacs-widget-accessors.c (Fgtk_plug_socket_window): - * emacs-widget-accessors.c (Fgtk_plug_same_app): - * emacs-widget-accessors.c (Fgtk_object_flags): - * emacs-widget-accessors.c (Fgtk_object_ref_count): - * emacs-widget-accessors.c (Fgtk_paned_child1): - * emacs-widget-accessors.c (Fgtk_paned_child2): - * emacs-widget-accessors.c (Fgtk_paned_child1_resize): - * emacs-widget-accessors.c (Fgtk_paned_child2_resize): - * emacs-widget-accessors.c (Fgtk_paned_child1_shrink): - * emacs-widget-accessors.c (Fgtk_paned_child2_shrink): - * emacs-widget-accessors.c (Fgtk_clist_rows): - * emacs-widget-accessors.c (Fgtk_clist_columns): - * emacs-widget-accessors.c (Fgtk_clist_hadjustment): - * emacs-widget-accessors.c (Fgtk_clist_vadjustment): - * emacs-widget-accessors.c (Fgtk_clist_sort_type): - * emacs-widget-accessors.c (Fgtk_clist_focus_row): - * emacs-widget-accessors.c (Fgtk_clist_sort_column): - * emacs-widget-accessors.c (Fgtk_list_children): - * emacs-widget-accessors.c (Fgtk_list_selection): - * emacs-widget-accessors.c (Fgtk_tree_children): - * emacs-widget-accessors.c (Fgtk_tree_root_tree): - * emacs-widget-accessors.c (Fgtk_tree_tree_owner): - * emacs-widget-accessors.c (Fgtk_tree_selection): - * emacs-widget-accessors.c (Fgtk_tree_item_subtree): - * emacs-widget-accessors.c (Fgtk_scrolled_window_hscrollbar): - * emacs-widget-accessors.c (Fgtk_scrolled_window_vscrollbar): - * emacs-widget-accessors.c (Fgtk_scrolled_window_hscrollbar_visible): - * emacs-widget-accessors.c (Fgtk_scrolled_window_vscrollbar_visible): - * emacs.c (main_1): - * emacs.c (Fsplit_path): - * emacs.c (syms_of_emacs): - * emodules.c (emodules_load): - * esd.c: - * esd.c (esd_play_sound_file): - * esd.c (esd_play_sound_data): - * eval.c: - * eval.c (print_subr): - * eval.c (FletX): - * eval.c (Flet): - * eval.c (Fdefvar): - * eval.c (Fdefconst): - * eval.c (condition_case_3): - * eval.c (return_from_signal): - * eval.c (signal_error_1): - * eval.c (maybe_signal_error_1): - * eval.c (maybe_signal_continuable_error_1): - * eval.c (signal_error): - * eval.c (maybe_signal_error): - * eval.c (signal_continuable_error): - * eval.c (maybe_signal_continuable_error): - * eval.c (signal_error_2): - * eval.c (maybe_signal_error_2): - * eval.c (signal_continuable_error_2): - * eval.c (maybe_signal_continuable_error_2): - * eval.c (signal_ferror): - * eval.c (maybe_signal_ferror): - * eval.c (signal_continuable_ferror): - * eval.c (maybe_signal_continuable_ferror): - * eval.c (signal_ferror_with_frob): - * eval.c (maybe_signal_ferror_with_frob): - * eval.c (signal_continuable_ferror_with_frob): - * eval.c (maybe_signal_continuable_ferror_with_frob): - * eval.c (signal_quit): - * eval.c (signal_invalid_function_error): - * eval.c (signal_wrong_number_of_arguments_error): - * eval.c (signal_malformed_list_error): - * eval.c (signal_malformed_property_list_error): - * eval.c (signal_circular_list_error): - * eval.c (signal_circular_property_list_error): - * eval.c (syntax_error): - * eval.c (syntax_error_2): - * eval.c (maybe_syntax_error): - * eval.c (sferror): - * eval.c (sferror_2): - * eval.c (maybe_sferror): - * eval.c (invalid_argument): - * eval.c (invalid_argument_2): - * eval.c (maybe_invalid_argument): - * eval.c (invalid_constant): - * eval.c (invalid_constant_2): - * eval.c (maybe_invalid_constant): - * eval.c (invalid_operation): - * eval.c (invalid_operation_2): - * eval.c (maybe_invalid_operation): - * eval.c (invalid_change): - * eval.c (invalid_change_2): - * eval.c (maybe_invalid_change): - * eval.c (invalid_state): - * eval.c (invalid_state_2): - * eval.c (maybe_invalid_state): - * eval.c (stack_overflow): - * eval.c (out_of_memory): - * eval.c (printing_unreadable_object): - * eval.c (do_autoload): - * eval.c (Feval): - * eval.c (Ffuncall): - * eval.c (grow_specpdl): - * eval.c (syms_of_eval): - * event-Xt.c (syms_of_event_Xt): - * event-gtk.c (syms_of_event_gtk): - * event-msw.c (mswindows_need_event_in_modal_loop): - * event-msw.c (emacs_mswindows_select_process): - * event-stream.c: - * event-stream.c (check_event_stream_ok): - * event-stream.c (lisp_number_to_milliseconds): - * event-stream.c (Fnext_event): - * event-stream.c (munge_keymap_translate): - * event-stream.c (Fset_recent_keys_ring_size): - * event-stream.c (execute_command_event): - * event-stream.c (syms_of_event_stream): - * events.c (print_event): - * events.c (Fmake_event): - * events.c (WRONG_EVENT_TYPE_FOR_PROPERTY): - * events.c (Fdeallocate_event): - * events.c (Fcopy_event): - * events.c (character_to_event): - * events.c (syms_of_events): - * extents.c (print_extent): - * extents.c (Fset_extent_parent): - * extents.c (decode_map_extents_flags): - * extents.c (decode_extent_at_flag): - * extents.c (symbol_to_glyph_layout): - * extents.c (Fset_extent_property): - * extents.c (syms_of_extents): - * faces.c (face_validate): - * faces.c (Fget_face): - * faces.c (syms_of_faces): - * file-coding.c: - * file-coding.c (print_coding_system): - * file-coding.c (symbol_to_eol_type): - * file-coding.c (Fget_coding_system): - * file-coding.c (parse_charset_conversion_specs): - * file-coding.c (Fmake_coding_system): - * file-coding.c (Fcoding_system_aliasee): - * file-coding.c (Fdefine_coding_system_alias): - * file-coding.c (Fcoding_system_property): - * file-coding.c (decode_coding_category): - * file-coding.c (Fset_coding_priority_list): - * file-coding.c (syms_of_file_coding): - * fileio.c: - * fileio.c (report_file_type_error): - * fileio.c (report_error_with_errno): - * fileio.c (report_file_error): - * fileio.c (Fmake_temp_name): - * fileio.c (Ffile_truename): - * fileio.c (Fmake_directory_internal): - * fileio.c (Fdelete_directory): - * fileio.c (Fdelete_file): - * fileio.c (Fset_file_modes): - * fileio.c (syms_of_fileio): - * filelock.c (syms_of_filelock): - * floatfns.c (float_error): - * fns.c: - * fns.c (check_losing_bytecode): - * fns.c (safe_copy_tree): - * fns.c (Fget): - * fns.c (Fput): - * fns.c (Fremprop): - * fns.c (Fobject_plist): - * fns.c (internal_equal): - * fns.c (internal_old_equal): - * fns.c (Fload_average): - * fns.c (Frequire): - * fns.c (base64_conversion_error): - * fns.c (base64_decode_1): - * fns.c (syms_of_fns): - * font-lock.c (syms_of_font_lock): - * frame-gtk.c (gtk_create_widgets): - * frame-gtk.c (gtk_init_frame_1): - * frame-gtk.c (gtk_cant_notify_wm_error): - * frame-gtk.c (syms_of_frame_gtk): - * frame-x.c (x_create_widgets): - * frame-x.c (x_init_frame_1): - * frame-x.c (x_cant_notify_wm_error): - * frame-x.c (syms_of_frame_x): - * frame.c (print_frame): - * frame.c (setup_frame_without_minibuffer): - * frame.c (Fmake_frame): - * frame.c (selected_frame): - * frame.c (device_selected_frame): - * frame.c (Fset_frame_selected_window): - * frame.c (delete_frame_internal): - * frame.c (Fmake_frame_invisible): - * frame.c (store_minibuf_frame_prop): - * frame.c (syms_of_frame): - * general-slots.h: - * glade.c (Fglade_xml_textdomain): - * glyphs-gtk.c: - * glyphs-gtk.c (check_pointer_sizes): - * glyphs-gtk.c (init_image_instance_from_gdk_image): - * glyphs-gtk.c (image_instance_add_gdk_image): - * glyphs-gtk.c (init_image_instance_from_xbm_inline): - * glyphs-gtk.c (write_lisp_string_to_temp_file): - * glyphs-gtk.c (gtk_xpm_instantiate): - * glyphs-gtk.c (gtk_xface_instantiate): - * glyphs-gtk.c (gtk_resource_validate): - * glyphs-gtk.c (gtk_resource_normalize): - * glyphs-gtk.c (gtk_resource_instantiate): - * glyphs-gtk.c (check_valid_resource_symbol): - * glyphs-gtk.c (check_valid_resource_id): - * glyphs-gtk.c (font_instantiate): - * glyphs-gtk.c (cursor_font_instantiate): - * glyphs-gtk.c (gtk_subwindow_instantiate): - * glyphs-gtk.c (syms_of_glyphs_gtk): - * glyphs-msw.c: - * glyphs-msw.c (init_image_instance_from_dibitmap): - * glyphs-msw.c (image_instance_add_dibitmap): - * glyphs-msw.c (mswindows_init_image_instance_from_eimage): - * glyphs-msw.c (xpm_to_eimage): - * glyphs-msw.c (mswindows_xpm_instantiate): - * glyphs-msw.c (mswindows_resource_validate): - * glyphs-msw.c (mswindows_resource_normalize): - * glyphs-msw.c (resource_name_to_resource): - * glyphs-msw.c (mswindows_resource_instantiate): - * glyphs-msw.c (check_valid_resource_symbol): - * glyphs-msw.c (check_valid_resource_id): - * glyphs-msw.c (mswindows_xface_instantiate): - * glyphs-msw.c (mswindows_subwindow_instantiate): - * glyphs-msw.c (mswindows_widget_instantiate): - * glyphs-msw.c (add_tree_item): - * glyphs-msw.c (add_tab_item): - * glyphs-msw.c (mswindows_combo_box_instantiate): - * glyphs-msw.c (syms_of_glyphs_mswindows): - * glyphs-msw.c (console_type_create_glyphs_mswindows): - * glyphs-widget.c (check_valid_orientation): - * glyphs-widget.c (check_valid_tab_orientation): - * glyphs-widget.c (check_valid_justification): - * glyphs-widget.c (widget_validate): - * glyphs-widget.c (combo_box_validate): - * glyphs-x.c (write_lisp_string_to_temp_file): - * glyphs-x.c (check_pointer_sizes): - * glyphs-x.c (init_image_instance_from_x_image): - * glyphs-x.c (image_instance_add_x_image): - * glyphs-x.c (init_image_instance_from_xbm_inline): - * glyphs-x.c (x_xpm_instantiate): - * glyphs-x.c (x_xface_instantiate): - * glyphs-x.c (font_instantiate): - * glyphs-x.c (cursor_font_instantiate): - * glyphs-x.c (x_redisplay_widget): - * glyphs-x.c (x_subwindow_instantiate): - * glyphs-x.c (x_widget_instantiate): - * glyphs.c: - * glyphs.c (decode_device_ii_format): - * glyphs.c (process_image_string_instantiator): - * glyphs.c (if): - * glyphs.c (file_or_data_must_be_present): - * glyphs.c (data_must_be_present): - * glyphs.c (face_must_be_present): - * glyphs.c (get_image_instantiator_governing_domain): - * glyphs.c (instantiate_image_instantiator): - * glyphs.c (print_image_instance): - * glyphs.c (decode_image_instance_type): - * glyphs.c (incompatible_image_types): - * glyphs.c (make_image_instance_1): - * glyphs.c (signal_image_error): - * glyphs.c (signal_image_error_2): - * glyphs.c (signal_double_image_error_2): - * glyphs.c (simple_image_type_normalize): - * glyphs.c (check_valid_xbm_inline): - * glyphs.c (bitmap_to_lisp_data): - * glyphs.c (xbm_normalize): - * glyphs.c (xface_normalize): - * glyphs.c (pixmap_to_lisp_data): - * glyphs.c (check_valid_xpm_color_symbols): - * glyphs.c (evaluate_xpm_color_symbols): - * glyphs.c (xpm_normalize): - * glyphs.c (image_instantiate): - * glyphs.c (image_validate): - * glyphs.c (print_glyph): - * glyphs.c (decode_glyph_type): - * glyphs.c (subwindow_instantiate): - * glyphs.c (syms_of_glyphs): - * glyphs.h: - * gpmevent.c (Fgpm_enable): - * gui-gtk.c (syms_of_gui_gtk): - * gui-x.c (button_item_to_widget_value): - * gui-x.c (gui_items_to_widget_values_1): - * gui-x.c (gui_items_to_widget_values): - * gui.c: - * gui.c (gui_item_add_keyval_pair): - * gui.c (make_gui_item_from_keywords_internal): - * gui.c (widget_gui_parse_item_keywords): - * gui.c (update_gui_item_keywords): - * gui.c (signal_too_long_error): - * gui.c (print_gui_item): - * gui.c (parse_gui_item_tree_item): - * gui.c (syms_of_gui): - * gutter.c (decode_gutter_position): - * gutter.c (gutter_validate): - * gutter.c (gutter_size_validate): - * gutter.c (gutter_visible_validate): - * gutter.c (syms_of_gutter): - * hpplay.c: - * hpplay.c (player_error_internal): - * hpplay.c (myHandler): - * hpplay.c (play_bucket_internal): - * hpplay.c (play_sound_file): - * hpplay.c (play_sound_data): - * hpplay.c (vars_of_hpplay): - * indent.c (Findent_to): - * indent.c (syms_of_indent): - * input-method-xlib.c (Fx_open_xim): - * input-method-xlib.c (Fx_close_xim): - * input-method-xlib.c (syms_of_input_method_xlib): - * insdel.c (get_buffer_range_char): - * insdel.c (get_string_range_char): - * insdel.c (make_gap): - * insdel.c (buffer_insert_string_1): - * intl.c (syms_of_intl): - * keymap.c (print_keymap): - * keymap.c (traverse_keymaps): - * keymap.c (check_keymap_definition_loop): - * keymap.c (define_key_check_and_coerce_keysym): - * keymap.c (define_key_parser): - * keymap.c (key_desc_list_to_event): - * keymap.c (ensure_meta_prefix_char_keymapp): - * keymap.c (Fdefine_key): - * keymap.c (Fsingle_key_description): - * keymap.c (Ftext_char_description): - * libsst.c: - * libsst.c (dial;): - * libsst.h: - * libsst.h (sst_dtmf): - * linuxplay.c: - * linuxplay.c (audio_init): - * linuxplay.c (linux_play_data_or_file): - * linuxplay.c (play_sound_file): - * linuxplay.c (play_sound_data): - * lisp.h: - * lread.c (read_syntax_error): - * lread.c (continuable_read_syntax_error): - * lread.c (readchar): - * lread.c (pas_de_holgazan_ici): - * lread.c (load_force_doc_string_unwind): - * lread.c (Fload_internal): - * lread.c (decode_mode_1): - * lread.c (readevalloop): - * lread.c (Feval_buffer): - * lread.c (read_escape): - * lread.c (FSF_LOSSAGE): - * lread.c (read_atom_0): - * lread.c (reader_nextchar): - * lread.c (read_list_conser): - * lread.c (syms_of_lread): - * lread.c (vars_of_lread): - * lstream.c (Lstream_internal_error): - * lstream.h (wrap_lstream): - * macros.c (Fstart_kbd_macro): - * macros.c (Fend_kbd_macro): - * macros.c (pop_kbd_macro_event): - * macros.c (Fcall_last_kbd_macro): - * macros.c (Fexecute_kbd_macro): - * macros.c (syms_of_macros): - * marker.c (print_marker): - * marker.c (set_marker_internal): - * marker.c (bi_marker_position): - * marker.c (marker_position): - * marker.c (set_bi_marker_position): - * marker.c (set_marker_position): - * md5.c (md5_coding_system): - * menubar-gtk.c (menu_convert): - * menubar-gtk.c (menu_descriptor_to_widget_1): - * menubar-msw.c (mswindows_translate_menu_or_dialog_item): - * menubar-msw.c (populate_menu_add_item): - * menubar-msw.c (populate_or_checksum_helper): - * menubar-msw.c (unsafe_handle_wm_initmenupopup_1): - * menubar-msw.c (mswindows_popup_menu): - * menubar-x.c (menu_item_descriptor_to_widget_value_1): - * menubar-x.c (x_popup_menu): - * menubar-x.c (Faccelerate_menu): - * menubar.c (syms_of_menubar): - * menubar.c (vars_of_menubar): - * minibuf.c (Ftry_completion): - * minibuf.c (syms_of_minibuf): - * miscplay.c: - * miscplay.c (parse_wave_complete): - * miscplay.c (waverequire): - * miscplay.c (parsewave): - * miscplay.c (parsesundecaudio): - * miscplay.c (sndcnv8U_2mono): - * miscplay.c (sndcnv8S_2mono): - * miscplay.c (sndcnv2monounsigned): - * miscplay.c (sndcnv2unsigned): - * miscplay.c (int2ulaw): - * miscplay.c (sndcnvULaw_2linear): - * miscplay.c (sndcnvULaw_2mono): - * miscplay.c (sndcnv16_2monoLE): - * miscplay.c (sndcnv16_2monoBE): - * miscplay.c (sndcnv2byteLE): - * miscplay.c (sndcnv2byteBE): - * miscplay.c (sndcnv2monobyteLE): - * miscplay.c (sndcnv2monobyteBE): - * miscplay.c (analyze_format): - * miscplay.h: - * miscplay.h (HEADERSZ): - * miscplay.h (parse_wave_complete): - * mule-ccl.c (Fccl_execute): - * mule-ccl.c (vars_of_mule_ccl): - * mule-charset.c (print_charset): - * mule-charset.c (get_unallocated_leading_byte): - * mule-charset.c (Fget_charset): - * mule-charset.c (Fmake_charset): - * mule-charset.c (Fcharset_from_attributes): - * mule-charset.c (Fcharset_property): - * mule-charset.c (Fset_charset_ccl_program): - * mule-charset.c (Fmake_char): - * mule-charset.c (Fchar_octet): - * mule-charset.c (lookup_composite_char): - * mule-charset.c (syms_of_mule_charset): - * mule-wnnfns.c (Fwnn_set_param): - * mule-wnnfns.c (syms_of_mule_wnn): - * mule.c (Fdefine_word_pattern): - * nas.c: - * nas.c (XTOOLKIT): - * nas.c (play_sound_file): - * nas.c (close_down_play): - * nas.c (do_caching_play): - * nas.c (play_sound_data): - * nas.c (CatchIoErrorAndJump): - * nas.c (NameFromData): - * nas.c (SndOpenDataForReading): - * nas.c (cmpID): - * nas.c (dread): - * nas.c (dgetc): - * nas.c (readChunk): - * nas.c (WaveOpenDataForReading): - * nas.c (SoundOpenDataForReading): - * ntplay.c: - * ntplay.c (play_sound_file): - * ntplay.c (play_sound_data_1): - * ntplay.c (play_sound_data): - * ntproc.c: - * ntproc.c (prepare_standard_handles): - * ntproc.c (vars_of_ntproc): - * objects-gtk.c (gtk_parse_nearest_color): - * objects-gtk.c (gtk_initialize_font_instance): - * objects-msw.c (mswindows_initialize_color_instance): - * objects-msw.c (initialize_font_instance): - * objects-x.c (x_parse_nearest_color): - * objects-x.c (x_initialize_font_instance): - * objects-x.c (x_font_instance_truename): - * objects.c (finalose): - * objects.c (print_color_instance): - * objects.c (print_font_instance): - * objects.c (font_instance_truename_internal): - * objects.c (color_instantiate): - * objects.c (color_validate): - * objects.c (font_validate): - * objects.c (face_boolean_instantiate): - * objects.c (face_boolean_validate): - * objects.c (syms_of_objects): - * postgresql.c (CHECK_LIVE_CONNECTION): - * postgresql.c (print_pgconn): - * postgresql.c (finalize_pgconn): - * postgresql.c (print_pgresult): - * postgresql.c (finalize_pgresult): - * postgresql.c (Fpq_connectdb): - * postgresql.c (Fpq_connect_start): - * postgresql.c (Fpq_connect_poll): - * postgresql.c (Fpq_set_client_encoding): - * postgresql.c (Fpq_reset_start): - * postgresql.c (Fpq_reset_poll): - * postgresql.c (Fpq_pgconn): - * postgresql.c (Fpq_exec): - * postgresql.c (Fpq_send_query): - * postgresql.c (Fpq_get_result): - * postgresql.c (Fpq_result_status): - * postgresql.c (Fpq_make_empty_pgresult): - * postgresql.c (syms_of_postgresql): - * print.c: - * print.c (print_error_message): - * print.c (print_cons): - * print.c (default_object_printer): - * print.c (Fexternal_debugging_output): - * print.c (Fopen_termscript): - * print.c (syms_of_print): - * process-nt.c: - * process-nt.c (validate_signal_number): - * process-nt.c (mswindows_report_process_error): - * process-nt.c (mswindows_report_winsock_error): - * process-nt.c (nt_create_process): - * process-nt.c (get_internet_address): - * process-nt.c (nt_canonicalize_host_name): - * process-nt.c (nt_open_network_stream): - * process-unix.c (get_internet_address): - * process-unix.c (unix_create_process): - * process-unix.c (unix_send_process): - * process-unix.c (unix_kill_child_process): - * process-unix.c (unix_canonicalize_host_name): - * process-unix.c (unix_open_network_stream): - * process-unix.c (unix_open_multicast_group): - * process.c: - * process.c (print_process): - * process.c (get_process): - * process.c (report_process_error): - * process.c (init_process_io_handles): - * process.c (Fstart_process_internal): - * process.c (send_process): - * process.c (decode_signal): - * process.c (process_send_signal): - * process.c (Fkill_process): - * process.c (Fquit_process): - * process.c (Fstop_process): - * process.c (Fcontinue_process): - * process.c (Fprocess_send_eof): - * process.c (syms_of_process): - * ralloc.c (syms_of_ralloc): - * rangetab.c (Fput_range_table): - * rangetab.c (rangetab_data_validate): - * rangetab.c (syms_of_rangetab): - * redisplay.c (syms_of_redisplay): - * scrollbar.c (syms_of_scrollbar): - * search.c (matcher_overflow): - * search.c (compile_pattern_1): - * search.c (skip_chars): - * search.c (search_command): - * search.c (Freplace_match): - * search.c (Fmatch_data): - * search.c (syms_of_search): - * select-gtk.c (gtk_get_foreign_selection): - * select-gtk.c (gtk_get_window_property_as_lisp_data): - * select-gtk.c (lisp_data_to_selection_data): - * select-x.c (motif_clipboard_cb): - * select-x.c (x_reply_selection_request): - * select-x.c (copy_multiple_data): - * select-x.c (x_get_foreign_selection): - * select-x.c (x_get_window_property_as_lisp_data): - * select-x.c (lisp_data_to_selection_data): - * select-x.c (CHECK_CUTBUFFER): - * select-x.c (Fx_get_cutbuffer_internal): - * select-x.c (syms_of_select_x): - * select.c (Fown_selection_internal): - * select.c (syms_of_select): - * sgiplay.c: - * sgiplay.c (play_sound_file): - * sgiplay.c (play_sound_data): - * sgiplay.c (audio_initialize): - * sgiplay.c (play_internal): - * sgiplay.c (write_mulaw_8_chunk): - * sgiplay.c (write_linear_chunk): - * sgiplay.c (initialize_audio_port): - * sgiplay.c (open_audio_port): - * sgiplay.c (set_channels): - * sgiplay.c (set_output_format): - * sgiplay.c (struct): - * sgiplay.c (parse_snd_header): - * sheap.c (sheap_adjust_h): - * sound.c: - * sound.c (report_sound_error): - * sound.c (Fplay_sound_file): - * sound.c (Fplay_sound): - * sound.c (Fding): - * sound.c (init_nas_sound): - * sound.c (init_native_sound): - * sound.c (syms_of_sound): - * specifier.c: - * specifier.c (print_specifier): - * specifier.c (decode_specifier_type): - * specifier.c (check_valid_locale_or_locale_type): - * specifier.c (decode_locale): - * specifier.c (decode_locale_type): - * specifier.c (check_valid_domain): - * specifier.c (decode_specifier_tag_set): - * specifier.c (Fcanonicalize_tag_set): - * specifier.c (Fdefine_specifier_tag): - * specifier.c (Fspecifier_tag_predicate): - * specifier.c (check_valid_inst_list): - * specifier.c (check_valid_spec_list): - * specifier.c (decode_how_to_add_specification): - * specifier.c (check_modifiable_specifier): - * specifier.c (Fcopy_specifier): - * specifier.c (check_valid_specifier_matchspec): - * specifier.c (specifier_instance): - * specifier.c (boolean_validate): - * specifier.c (syms_of_specifier): - * sunplay.c: - * sunplay.c (init_device): - * sunplay.c (play_sound_file): - * sunplay.c (play_sound_data): - * symbols.c (oblookup): - * symbols.c (reject_constant_symbols): - * symbols.c (verify_ok_for_buffer_local): - * symbols.c (Fset): - * symbols.c (decode_magic_handler_type): - * symbols.c (handler_type_from_function_symbol): - * symbols.c (Fdefvaralias): - * symbols.c (init_symbols_once_early): - * symeval.h: - * symsinit.h: - * syntax.c (scan_lists): - * syntax.c (scan_sexps_forward): - * syntax.c (syms_of_syntax): - * sysdep.c (stuff_char): - * sysdep.c (sys_subshell): - * sysdep.c (dup2): - * toolbar-msw.c (mswindows_output_toolbar): - * toolbar.c (decode_toolbar_position): - * toolbar.c (compute_frame_toolbar_buttons): - * toolbar.c (CTB_ERROR): - * toolbar.c (check_toolbar_button_keywords): - * toolbar.c (toolbar_validate): - * toolbar.c (syms_of_toolbar): - * tooltalk.c (print_tooltalk_message): - * tooltalk.c (print_tooltalk_pattern): - * tooltalk.c (check_status): - * tooltalk.c (Ftooltalk_open_connection): - * tooltalk.c (syms_of_tooltalk): - * ui-byhand.c (Fgtk_box_query_child_packing): - * ui-byhand.c (Fgtk_button_box_get_child_size): - * ui-byhand.c (Fgtk_calendar_get_date): - * ui-byhand.c (Fgtk_clist_get_text): - * ui-byhand.c (Fgtk_clist_get_selection): - * ui-byhand.c (Fgtk_clist_get_pixmap): - * ui-byhand.c (Fgtk_clist_get_pixtext): - * ui-byhand.c (Fgtk_color_selection_get_color): - * ui-byhand.c (Fgtk_editable_insert_text): - * ui-byhand.c (Fgtk_pixmap_get): - * ui-byhand.c (Fgtk_curve_get_vector): - * ui-byhand.c (Fgtk_curve_set_vector): - * ui-byhand.c (Fgtk_label_get): - * ui-byhand.c (Fgtk_notebook_query_tab_label_packing): - * ui-byhand.c (Fgtk_widget_get_pointer): - * ui-byhand.c (generic_toolbar_insert_item): - * ui-gtk.c (Fdll_load): - * ui-gtk.c (ffi_object_printer): - * ui-gtk.c (Fgtk_import_variable_internal): - * ui-gtk.c (Fgtk_import_function_internal): - * ui-gtk.c (Fgtk_call_function): - * ui-gtk.c (emacs_gtk_object_printer): - * ui-gtk.c (object_getprop): - * ui-gtk.c (object_putprop): - * ui-gtk.c (emacs_gtk_object_finalizer): - * ui-gtk.c (emacs_gtk_boxed_printer): - * ui-gtk.c (Fgtk_fundamental_type): - * ui-gtk.c (Fgtk_describe_type): - * ui-gtk.c (syms_of_ui_gtk): - * ui-gtk.c (lisp_to_gtk_type): - * ui-gtk.c (symbol_to_enum): - * ui-gtk.c (enum_to_symbol): - * undo.c (Fprimitive_undo): - * undo.c (syms_of_undo): - * unexaix.c (report_error): - * unexaix.c (report_error_1): - * unexapollo.c (unexec): - * unexapollo.c (CopyData): - * unexconvex.c (report_error): - * unexconvex.c (a2;): - * unexec.c (report_error): - * unexec.c (report_error_1): - * widget.c (syms_of_widget): - * win32.c (Fmswindows_shell_execute): - * window.c (print_window): - * window.c (Fdelete_window): - * window.c (Fdelete_other_windows): - * window.c (Fset_window_buffer): - * window.c (Fselect_window): - * window.c (Fsplit_window): - * window.c (change_window_height): - * window.c (window_scroll): - * window.c (Fother_window_for_scrolling): - * window.c (print_window_config): - * window.c (syms_of_window): - 2001-05-19 Ben Wing <ben@xemacs.org> * glyphs-shared.c: New. Try just a bit to start eliminating @@ -1358,7 +642,6 @@ * general-slots.h: * glade.c (Fglade_xml_textdomain): * glyphs-gtk.c: - * glyphs-msw.c (console_type_create_glyphs_mswindows): * glyphs-gtk.c (check_pointer_sizes): * glyphs-gtk.c (init_image_instance_from_gdk_image): * glyphs-gtk.c (image_instance_add_gdk_image): @@ -1376,6 +659,7 @@ * glyphs-gtk.c (gtk_subwindow_instantiate): * glyphs-gtk.c (syms_of_glyphs_gtk): * glyphs-msw.c: + * glyphs-msw.c (console_type_create_glyphs_mswindows): * glyphs-msw.c (init_image_instance_from_dibitmap): * glyphs-msw.c (image_instance_add_dibitmap): * glyphs-msw.c (mswindows_init_image_instance_from_eimage):
--- a/src/alloc.c Fri May 25 10:04:29 2001 +0000 +++ b/src/alloc.c Fri May 25 11:27:01 2001 +0000 @@ -163,7 +163,7 @@ #ifdef ERROR_CHECK_TYPECHECK -Error_behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN; +Error_Behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN; #endif
--- a/src/buffer.h Fri May 25 10:04:29 2001 +0000 +++ b/src/buffer.h Fri May 25 11:27:01 2001 +0000 @@ -1284,12 +1284,12 @@ #define DFC_C_STRING_ALLOCA_USE_CONVERTED_DATA(sink) do { \ void * dfc_sink_ret = alloca (dfc_sink.data.len + 1); \ memcpy (dfc_sink_ret, dfc_sink.data.ptr, dfc_sink.data.len + 1); \ - (sink) = (char *) dfc_sink_ret; \ + ((dfc_aliasing_voidpp) &(sink))->p = dfc_sink_ret; \ } while (0) #define DFC_C_STRING_MALLOC_USE_CONVERTED_DATA(sink) do { \ void * dfc_sink_ret = xmalloc (dfc_sink.data.len + 1); \ memcpy (dfc_sink_ret, dfc_sink.data.ptr, dfc_sink.data.len + 1); \ - (sink) = (char *) dfc_sink_ret; \ + ((dfc_aliasing_voidpp) &(sink))->p = dfc_sink_ret; \ } while (0) #define DFC_LISP_STRING_USE_CONVERTED_DATA(sink) \ sink = make_string ((Bufbyte *) dfc_sink.data.ptr, dfc_sink.data.len)
--- a/src/chartab.c Fri May 25 10:04:29 2001 +0000 +++ b/src/chartab.c Fri May 25 11:27:01 2001 +0000 @@ -948,7 +948,7 @@ static int check_valid_char_table_value (Lisp_Object value, enum char_table_type type, - Error_behavior errb) + Error_Behavior errb) { switch (type) { @@ -1474,7 +1474,7 @@ static int chartab_type_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { /* #### should deal with ERRB */ symbol_to_char_table_type (value); @@ -1483,7 +1483,7 @@ static int chartab_data_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { Lisp_Object rest;
--- a/src/console-gtk.c Fri May 25 10:04:29 2001 +0000 +++ b/src/console-gtk.c Fri May 25 11:27:01 2001 +0000 @@ -45,7 +45,7 @@ the integrity of our input, because the generic functions don't. */ static Lisp_Object -gtk_device_to_console_connection (Lisp_Object connection, Error_behavior errb) +gtk_device_to_console_connection (Lisp_Object connection, Error_Behavior errb) { /* Strip the trailing .# off of the connection, if it's there. */ @@ -60,7 +60,7 @@ static Lisp_Object gtk_semi_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { struct gcpro gcpro1; @@ -72,7 +72,7 @@ } static Lisp_Object -gtk_canonicalize_console_connection (Lisp_Object connection, Error_behavior errb) +gtk_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { Lisp_Object hostname = Qnil; struct gcpro gcpro1, gcpro2; @@ -86,7 +86,7 @@ static Lisp_Object gtk_semi_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { struct gcpro gcpro1; @@ -98,7 +98,7 @@ } static Lisp_Object -gtk_canonicalize_device_connection (Lisp_Object connection, Error_behavior errb) +gtk_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { struct gcpro gcpro1;
--- a/src/console-msw.c Fri May 25 10:04:29 2001 +0000 +++ b/src/console-msw.c Fri May 25 11:27:01 2001 +0000 @@ -148,7 +148,7 @@ static Lisp_Object mswindows_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { /* Do not allow more than one mswindows device, by explicitly requiring that CONNECTION is nil, the only allowed connection in @@ -168,7 +168,7 @@ static Lisp_Object mswindows_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return mswindows_canonicalize_console_connection (connection, errb); } @@ -598,7 +598,7 @@ static Lisp_Object msprinter_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { /* If nil connection is specified, transform it into the name of the default printer */ @@ -621,7 +621,7 @@ static Lisp_Object msprinter_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return msprinter_canonicalize_console_connection (connection, errb); }
--- a/src/console-stream.c Fri May 25 10:04:29 2001 +0000 +++ b/src/console-stream.c Fri May 25 11:27:01 2001 +0000 @@ -118,14 +118,14 @@ Lisp_Object stream_semi_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return NILP (connection) ? Vstdio_str : connection; } Lisp_Object stream_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { if (NILP (connection) || internal_equal (connection, Vstdio_str, 0)) return Vstdio_str; @@ -143,14 +143,14 @@ Lisp_Object stream_semi_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return stream_semi_canonicalize_console_connection (connection, errb); } Lisp_Object stream_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return stream_canonicalize_console_connection (connection, errb); }
--- a/src/console-stream.h Fri May 25 10:04:29 2001 +0000 +++ b/src/console-stream.h Fri May 25 11:27:01 2001 +0000 @@ -43,11 +43,11 @@ extern Lisp_Object Vterminal_console, Vterminal_frame, Vterminal_device; Lisp_Object stream_semi_canonicalize_console_connection(Lisp_Object, - Error_behavior); + Error_Behavior); Lisp_Object stream_canonicalize_console_connection(Lisp_Object, - Error_behavior); + Error_Behavior); Lisp_Object stream_semi_canonicalize_device_connection(Lisp_Object, - Error_behavior); + Error_Behavior); Lisp_Object stream_canonicalize_device_connection(Lisp_Object, - Error_behavior); + Error_Behavior); #endif /* INCLUDED_console_stream_h_ */
--- a/src/console-tty.c Fri May 25 10:04:29 2001 +0000 +++ b/src/console-tty.c Fri May 25 11:27:01 2001 +0000 @@ -303,28 +303,28 @@ Lisp_Object tty_semi_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return stream_semi_canonicalize_console_connection (connection, errb); } Lisp_Object tty_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return stream_canonicalize_console_connection (connection, errb); } Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return stream_semi_canonicalize_console_connection (connection, errb); } Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return stream_canonicalize_console_connection (connection, errb); }
--- a/src/console-tty.h Fri May 25 10:04:29 2001 +0000 +++ b/src/console-tty.h Fri May 25 11:27:01 2001 +0000 @@ -280,13 +280,13 @@ /* called from console-stream.c */ Lisp_Object tty_semi_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb); + Error_Behavior errb); Lisp_Object tty_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb); + Error_Behavior errb); Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb); + Error_Behavior errb); Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb); + Error_Behavior errb); struct console * tty_find_console_from_fd (int fd); #endif /* INCLUDED_console_tty_h_ */
--- a/src/console-x.c Fri May 25 10:04:29 2001 +0000 +++ b/src/console-x.c Fri May 25 11:27:01 2001 +0000 @@ -86,7 +86,7 @@ the integrity of our input, because the generic functions don't. */ static Lisp_Object -x_device_to_console_connection (Lisp_Object connection, Error_behavior errb) +x_device_to_console_connection (Lisp_Object connection, Error_Behavior errb) { /* Strip the trailing .# off of the connection, if it's there. */ @@ -167,7 +167,7 @@ static Lisp_Object x_semi_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { struct gcpro gcpro1; @@ -218,7 +218,7 @@ } static Lisp_Object -x_canonicalize_console_connection (Lisp_Object connection, Error_behavior errb) +x_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { Lisp_Object hostname = Qnil; struct gcpro gcpro1, gcpro2; @@ -246,7 +246,7 @@ static Lisp_Object x_semi_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { int hostname_length, display_length, screen_length; struct gcpro gcpro1; @@ -274,7 +274,7 @@ } static Lisp_Object -x_canonicalize_device_connection (Lisp_Object connection, Error_behavior errb) +x_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { int hostname_length, display_length, screen_length; Lisp_Object screen_str = Qnil;
--- a/src/console.c Fri May 25 10:04:29 2001 +0000 +++ b/src/console.c Fri May 25 11:27:01 2001 +0000 @@ -176,7 +176,7 @@ struct console_methods * -decode_console_type (Lisp_Object type, Error_behavior errb) +decode_console_type (Lisp_Object type, Error_Behavior errb) { int i; @@ -358,7 +358,7 @@ static Lisp_Object semi_canonicalize_console_connection (struct console_methods *meths, - Lisp_Object name, Error_behavior errb) + Lisp_Object name, Error_Behavior errb) { if (HAS_CONTYPE_METH_P (meths, semi_canonicalize_console_connection)) return CONTYPE_METH (meths, semi_canonicalize_console_connection, @@ -370,7 +370,7 @@ static Lisp_Object canonicalize_console_connection (struct console_methods *meths, - Lisp_Object name, Error_behavior errb) + Lisp_Object name, Error_Behavior errb) { if (HAS_CONTYPE_METH_P (meths, canonicalize_console_connection)) return CONTYPE_METH (meths, canonicalize_console_connection,
--- a/src/console.h Fri May 25 10:04:29 2001 +0000 +++ b/src/console.h Fri May 25 11:27:01 2001 +0000 @@ -98,15 +98,15 @@ int (*initially_selected_for_input_method) (struct console *); void (*delete_console_method) (struct console *); Lisp_Object (*semi_canonicalize_console_connection_method) - (Lisp_Object connection, Error_behavior errb); + (Lisp_Object connection, Error_Behavior errb); Lisp_Object (*semi_canonicalize_device_connection_method) - (Lisp_Object connection, Error_behavior errb); + (Lisp_Object connection, Error_Behavior errb); Lisp_Object (*canonicalize_console_connection_method) - (Lisp_Object connection, Error_behavior errb); + (Lisp_Object connection, Error_Behavior errb); Lisp_Object (*canonicalize_device_connection_method) - (Lisp_Object connection, Error_behavior errb); + (Lisp_Object connection, Error_Behavior errb); Lisp_Object (*device_to_console_connection_method) - (Lisp_Object connection, Error_behavior errb); + (Lisp_Object connection, Error_Behavior errb); /* device methods */ void (*init_device_method) (struct device *, Lisp_Object props); @@ -210,7 +210,7 @@ int (*initialize_color_instance_method) (Lisp_Color_Instance *, Lisp_Object name, Lisp_Object device, - Error_behavior errb); + Error_Behavior errb); void (*mark_color_instance_method) (Lisp_Color_Instance *); void (*print_color_instance_method) (Lisp_Color_Instance *, Lisp_Object printcharfun, @@ -228,14 +228,14 @@ int (*initialize_font_instance_method) (Lisp_Font_Instance *, Lisp_Object name, Lisp_Object device, - Error_behavior errb); + Error_Behavior errb); void (*mark_font_instance_method) (Lisp_Font_Instance *); void (*print_font_instance_method) (Lisp_Font_Instance *, Lisp_Object printcharfun, int escapeflag); void (*finalize_font_instance_method) (Lisp_Font_Instance *); Lisp_Object (*font_instance_truename_method) (Lisp_Font_Instance *, - Error_behavior errb); + Error_Behavior errb); Lisp_Object (*font_instance_properties_method) (Lisp_Font_Instance *); Lisp_Object (*list_fonts_method) (Lisp_Object pattern, Lisp_Object device); @@ -624,7 +624,7 @@ void add_entry_to_console_type_list (Lisp_Object symbol, struct console_methods *type); struct console_methods *decode_console_type (Lisp_Object type, - Error_behavior errb); + Error_Behavior errb); void delete_console_internal (struct console *con, int force, int from_kill_emacs, int from_io_error); void io_error_delete_console (Lisp_Object console);
--- a/src/device-msw.c Fri May 25 10:04:29 2001 +0000 +++ b/src/device-msw.c Fri May 25 11:27:01 2001 +0000 @@ -404,7 +404,7 @@ msprinter_default_printer (void) { Extbyte name[666]; - char *nameint; + Bufbyte *nameint; if (GetProfileString (XETEXT ("windows"), XETEXT ("device"), NULL, name, sizeof (name) / XETCHAR_SIZE) <= 0)
--- a/src/device-x.c Fri May 25 10:04:29 2001 +0000 +++ b/src/device-x.c Fri May 25 11:27:01 2001 +0000 @@ -1441,7 +1441,7 @@ char *raw_result; XrmDatabase db; Display *display; - Error_behavior errb = decode_error_behavior_flag (noerror); + Error_Behavior errb = decode_error_behavior_flag (noerror); CHECK_STRING (name); CHECK_STRING (class);
--- a/src/device.c Fri May 25 10:04:29 2001 +0000 +++ b/src/device.c Fri May 25 11:27:01 2001 +0000 @@ -384,7 +384,7 @@ static Lisp_Object semi_canonicalize_device_connection (struct console_methods *meths, - Lisp_Object name, Error_behavior errb) + Lisp_Object name, Error_Behavior errb) { if (HAS_CONTYPE_METH_P (meths, semi_canonicalize_device_connection)) return CONTYPE_METH (meths, semi_canonicalize_device_connection, @@ -396,7 +396,7 @@ static Lisp_Object canonicalize_device_connection (struct console_methods *meths, - Lisp_Object name, Error_behavior errb) + Lisp_Object name, Error_Behavior errb) { if (HAS_CONTYPE_METH_P (meths, canonicalize_device_connection)) return CONTYPE_METH (meths, canonicalize_device_connection,
--- a/src/eldap.c Fri May 25 10:04:29 2001 +0000 +++ b/src/eldap.c Fri May 25 11:27:01 2001 +0000 @@ -330,7 +330,7 @@ err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth); if (err != LDAP_SUCCESS) { - char *interrmess; + Bufbyte *interrmess; EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative); signal_error (Qprocess_error, "Failed binding to the server", build_string (interrmess));
--- a/src/elhash.c Fri May 25 10:04:29 2001 +0000 +++ b/src/elhash.c Fri May 25 11:27:01 2001 +0000 @@ -573,7 +573,7 @@ unclear how this would cope with ERRB. */ static int hash_table_size_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { if (NATNUMP (value)) return 1; @@ -591,7 +591,7 @@ static int hash_table_weakness_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { if (EQ (value, Qnil)) return 1; if (EQ (value, Qt)) return 1; @@ -635,7 +635,7 @@ static int hash_table_test_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { if (EQ (value, Qnil)) return 1; if (EQ (value, Qeq)) return 1; @@ -661,7 +661,7 @@ static int hash_table_rehash_size_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { if (!FLOATP (value)) { @@ -692,7 +692,7 @@ static int hash_table_rehash_threshold_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { if (!FLOATP (value)) { @@ -723,7 +723,7 @@ static int hash_table_data_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { int len;
--- a/src/emodules.c Fri May 25 10:04:29 2001 +0000 +++ b/src/emodules.c Fri May 25 11:27:01 2001 +0000 @@ -351,7 +351,7 @@ dlhandle = dll_open (soname); if (dlhandle == (dll_handle)0) { - char *dllerrint; + Bufbyte *dllerrint; EXTERNAL_TO_C_STRING (dll_error (dlhandle), dllerrint, Qnative); signal_error (Qdll_error, "Opening dynamic module",
--- a/src/eval.c Fri May 25 10:04:29 2001 +0000 +++ b/src/eval.c Fri May 25 11:27:01 2001 +0000 @@ -2122,7 +2122,7 @@ (2) silently fail and return some error value. (3) do as (2) but issue a warning in the process. - Currently there's lots of stuff that passes an Error_behavior + Currently there's lots of stuff that passes an Error_Behavior value and calls maybe_signal_error() and other such functions. This approach is inherently error-prone and broken. A much more robust and easier approach is to use call_with_suspended_errors(). @@ -2132,7 +2132,7 @@ Lisp_Object call_with_suspended_errors (lisp_fn_t fun, volatile Lisp_Object retval, - Lisp_Object class, Error_behavior errb, + Lisp_Object class, Error_Behavior errb, int nargs, ...) { va_list vargs; @@ -2224,7 +2224,7 @@ void maybe_signal_error_1 (Lisp_Object sig, Lisp_Object data, Lisp_Object class, - Error_behavior errb) + Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME_NOT)) return; @@ -2240,7 +2240,7 @@ Lisp_Object maybe_signal_continuable_error_1 (Lisp_Object sig, Lisp_Object data, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME_NOT)) return Qnil; @@ -2293,7 +2293,7 @@ void maybe_signal_error (Lisp_Object type, const char *reason, Lisp_Object frob, Lisp_Object class, - Error_behavior errb) + Error_Behavior errb) { /* Optimization: */ if (ERRB_EQ (errb, ERROR_ME_NOT)) @@ -2311,7 +2311,7 @@ Lisp_Object maybe_signal_continuable_error (Lisp_Object type, const char *reason, Lisp_Object frob, Lisp_Object class, - Error_behavior errb) + Error_Behavior errb) { /* Optimization: */ if (ERRB_EQ (errb, ERROR_ME_NOT)) @@ -2341,7 +2341,7 @@ void maybe_signal_error_2 (Lisp_Object type, const char *reason, Lisp_Object frob0, Lisp_Object frob1, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { /* Optimization: */ if (ERRB_EQ (errb, ERROR_ME_NOT)) @@ -2361,7 +2361,7 @@ Lisp_Object maybe_signal_continuable_error_2 (Lisp_Object type, const char *reason, Lisp_Object frob0, Lisp_Object frob1, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { /* Optimization: */ if (ERRB_EQ (errb, ERROR_ME_NOT)) @@ -2394,7 +2394,7 @@ } void -maybe_signal_ferror (Lisp_Object type, Lisp_Object class, Error_behavior errb, +maybe_signal_ferror (Lisp_Object type, Lisp_Object class, Error_Behavior errb, const char *fmt, ...) { Lisp_Object obj; @@ -2430,7 +2430,7 @@ Lisp_Object maybe_signal_continuable_ferror (Lisp_Object type, Lisp_Object class, - Error_behavior errb, const char *fmt, ...) + Error_Behavior errb, const char *fmt, ...) { Lisp_Object obj; va_list args; @@ -2481,7 +2481,7 @@ void maybe_signal_ferror_with_frob (Lisp_Object type, Lisp_Object frob, - Lisp_Object class, Error_behavior errb, + Lisp_Object class, Error_Behavior errb, const char *fmt, ...) { Lisp_Object obj; @@ -2520,7 +2520,7 @@ Lisp_Object maybe_signal_continuable_ferror_with_frob (Lisp_Object type, Lisp_Object frob, Lisp_Object class, - Error_behavior errb, + Error_Behavior errb, const char *fmt, ...) { Lisp_Object obj; @@ -2616,7 +2616,7 @@ void maybe_syntax_error (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qsyntax_error, reason, frob, class, errb); } @@ -2635,7 +2635,7 @@ void maybe_sferror (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qstructure_formation_error, reason, frob, class, errb); } @@ -2654,7 +2654,7 @@ void maybe_invalid_argument (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qinvalid_argument, reason, frob, class, errb); } @@ -2673,7 +2673,7 @@ void maybe_invalid_constant (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qinvalid_constant, reason, frob, class, errb); } @@ -2692,7 +2692,7 @@ void maybe_invalid_operation (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qinvalid_operation, reason, frob, class, errb); } @@ -2711,7 +2711,7 @@ void maybe_invalid_change (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qinvalid_change, reason, frob, class, errb); } @@ -2730,7 +2730,7 @@ void maybe_invalid_state (const char *reason, Lisp_Object frob, - Lisp_Object class, Error_behavior errb) + Lisp_Object class, Error_Behavior errb) { maybe_signal_error (Qinvalid_state, reason, frob, class, errb); }
--- a/src/faces.c Fri May 25 10:04:29 2001 +0000 +++ b/src/faces.c Fri May 25 11:27:01 2001 +0000 @@ -294,7 +294,7 @@ static int face_name_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME)) { @@ -306,7 +306,7 @@ } static int -face_validate (Lisp_Object data, Error_behavior errb) +face_validate (Lisp_Object data, Error_Behavior errb) { int name_seen = 0; Lisp_Object valw = Qnil; @@ -555,7 +555,7 @@ Lisp_Object face_property_matching_instance (Lisp_Object face, Lisp_Object property, Lisp_Object charset, Lisp_Object domain, - Error_behavior errb, int no_fallback, + Error_Behavior errb, int no_fallback, Lisp_Object depth) { Lisp_Object retval =
--- a/src/faces.h Fri May 25 10:04:29 2001 +0000 +++ b/src/faces.h Fri May 25 11:27:01 2001 +0000 @@ -334,7 +334,7 @@ Lisp_Object property, Lisp_Object charset, Lisp_Object domain, - Error_behavior errb, + Error_Behavior errb, int no_fallback, Lisp_Object depth);
--- a/src/fns.c Fri May 25 10:04:29 2001 +0000 +++ b/src/fns.c Fri May 25 11:27:01 2001 +0000 @@ -2049,7 +2049,7 @@ result in a list with an odd length. */ static Lisp_Object -bad_bad_bunny (Lisp_Object *plist, Lisp_Object *badplace, Error_behavior errb) +bad_bad_bunny (Lisp_Object *plist, Lisp_Object *badplace, Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME)) return Fsignal (Qmalformed_property_list, list2 (*plist, *badplace)); @@ -2076,7 +2076,7 @@ */ static Lisp_Object -bad_bad_turtle (Lisp_Object *plist, Lisp_Object *badplace, Error_behavior errb) +bad_bad_turtle (Lisp_Object *plist, Lisp_Object *badplace, Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME)) return Fsignal (Qcircular_property_list, list1 (*plist)); @@ -2105,7 +2105,7 @@ static int advance_plist_pointers (Lisp_Object *plist, Lisp_Object **tortoise, Lisp_Object **hare, - Error_behavior errb, Lisp_Object *retval) + Error_Behavior errb, Lisp_Object *retval) { int i; Lisp_Object *tortsave = *tortoise; @@ -2187,7 +2187,7 @@ Lisp_Object external_plist_get (Lisp_Object *plist, Lisp_Object property, - int laxp, Error_behavior errb) + int laxp, Error_Behavior errb) { Lisp_Object *tortoise = plist; Lisp_Object *hare = plist; @@ -2221,7 +2221,7 @@ void external_plist_put (Lisp_Object *plist, Lisp_Object property, - Lisp_Object value, int laxp, Error_behavior errb) + Lisp_Object value, int laxp, Error_Behavior errb) { Lisp_Object *tortoise = plist; Lisp_Object *hare = plist; @@ -2248,7 +2248,7 @@ int external_remprop (Lisp_Object *plist, Lisp_Object property, - int laxp, Error_behavior errb) + int laxp, Error_Behavior errb) { Lisp_Object *tortoise = plist; Lisp_Object *hare = plist;
--- a/src/glyphs.c Fri May 25 10:04:29 2001 +0000 +++ b/src/glyphs.c Fri May 25 11:27:01 2001 +0000 @@ -154,7 +154,7 @@ struct image_instantiator_methods * decode_device_ii_format (Lisp_Object device, Lisp_Object format, - Error_behavior errb) + Error_Behavior errb) { int i; @@ -190,7 +190,7 @@ } struct image_instantiator_methods * -decode_image_instantiator_format (Lisp_Object format, Error_behavior errb) +decode_image_instantiator_format (Lisp_Object format, Error_Behavior errb) { return decode_device_ii_format (Qnil, format, errb); } @@ -1291,7 +1291,7 @@ } static enum image_instance_type -decode_image_instance_type (Lisp_Object type, Error_behavior errb) +decode_image_instance_type (Lisp_Object type, Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME)) CHECK_SYMBOL (type); @@ -1413,7 +1413,7 @@ return Fcopy_sequence (Vimage_instance_type_list); } -Error_behavior +Error_Behavior decode_error_behavior_flag (Lisp_Object noerror) { if (NILP (noerror)) return ERROR_ME; @@ -1422,7 +1422,7 @@ } Lisp_Object -encode_error_behavior_flag (Error_behavior errb) +encode_error_behavior_flag (Error_Behavior errb) { if (ERRB_EQ (errb, ERROR_ME)) return Qnil; @@ -1575,7 +1575,7 @@ */ (data, domain, dest_types, noerror)) { - Error_behavior errb = decode_error_behavior_flag (noerror); + Error_Behavior errb = decode_error_behavior_flag (noerror); return call_with_suspended_errors ((lisp_fn_t) make_image_instance_1, Qnil, Qimage, errb, @@ -3762,7 +3762,7 @@ } static enum glyph_type -decode_glyph_type (Lisp_Object type, Error_behavior errb) +decode_glyph_type (Lisp_Object type, Error_Behavior errb) { if (NILP (type)) return GLYPH_BUFFER; @@ -3863,7 +3863,7 @@ Lisp_Object glyph_image_instance (Lisp_Object glyph, Lisp_Object domain, - Error_behavior errb, int no_quit) + Error_Behavior errb, int no_quit) { Lisp_Object specifier = GLYPH_IMAGE (XGLYPH (glyph));
--- a/src/glyphs.h Fri May 25 10:04:29 2001 +0000 +++ b/src/glyphs.h Fri May 25 11:27:01 2001 +0000 @@ -331,9 +331,9 @@ struct image_instantiator_methods * decode_device_ii_format (Lisp_Object device, Lisp_Object format, - Error_behavior errb); + Error_Behavior errb); struct image_instantiator_methods * -decode_image_instantiator_format (Lisp_Object format, Error_behavior errb); +decode_image_instantiator_format (Lisp_Object format, Error_Behavior errb); void add_entry_to_image_instantiator_format_list (Lisp_Object symbol, struct image_instantiator_methods *meths); @@ -999,7 +999,7 @@ int glyph_contrib_p (Lisp_Object glyph, Lisp_Object domain); Lisp_Object glyph_image_instance (Lisp_Object glyph, Lisp_Object domain, - Error_behavior errb, int no_quit); + Error_Behavior errb, int no_quit); void file_or_data_must_be_present (Lisp_Object instantiator); void data_must_be_present (Lisp_Object instantiator); Lisp_Object make_string_from_file (Lisp_Object file);
--- a/src/gui.c Fri May 25 10:04:29 2001 +0000 +++ b/src/gui.c Fri May 25 11:27:01 2001 +0000 @@ -117,7 +117,7 @@ int gui_item_add_keyval_pair (Lisp_Object gui_item, Lisp_Object key, Lisp_Object val, - Error_behavior errb) + Error_Behavior errb) { Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item); int retval = 0; @@ -214,7 +214,7 @@ */ static Lisp_Object make_gui_item_from_keywords_internal (Lisp_Object item, - Error_behavior errb) + Error_Behavior errb) { int length, plist_p, start; Lisp_Object *contents;
--- a/src/gui.h Fri May 25 10:04:29 2001 +0000 +++ b/src/gui.h Fri May 25 11:27:01 2001 +0000 @@ -72,7 +72,7 @@ Lisp_Object widget_gui_parse_item_keywords (Lisp_Object item); int gui_item_add_keyval_pair (Lisp_Object gui_item, Lisp_Object key, Lisp_Object val, - Error_behavior errb); + Error_Behavior errb); Lisp_Object gui_parse_item_keywords (Lisp_Object item); Lisp_Object gui_parse_item_keywords_no_errors (Lisp_Object item); void gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item);
--- a/src/hpplay.c Fri May 25 10:04:29 2001 +0000 +++ b/src/hpplay.c Fri May 25 11:27:01 2001 +0000 @@ -75,7 +75,7 @@ player_error_internal (Audio * audio, Char_ASCII * text, long errorCode) { Extbyte errorbuff[132]; - char *interr; + Bufbyte *interr; AGetErrorText (audio, errorCode, errorbuff, 131); EXTERNAL_TO_C_STRING (errorbuf, interr, Qnative);
--- a/src/lisp.h Fri May 25 10:04:29 2001 +0000 +++ b/src/lisp.h Fri May 25 11:27:01 2001 +0000 @@ -520,7 +520,7 @@ ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN -} Error_behavior; +} Error_Behavior; #define ERRB_EQ(a, b) ((a) == (b)) @@ -532,11 +532,11 @@ typedef struct _error_behavior_struct_ { int really_unlikely_name_to_have_accidentally_in_a_non_errb_structure; -} Error_behavior; - -extern Error_behavior ERROR_ME; -extern Error_behavior ERROR_ME_NOT; -extern Error_behavior ERROR_ME_WARN; +} Error_Behavior; + +extern Error_Behavior ERROR_ME; +extern Error_Behavior ERROR_ME_NOT; +extern Error_Behavior ERROR_ME_WARN; #define ERRB_EQ(a, b) \ ((a).really_unlikely_name_to_have_accidentally_in_a_non_errb_structure == \ @@ -1590,7 +1590,7 @@ { Lisp_Object keyword; int (*validate) (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb); + Error_Behavior errb); }; typedef struct @@ -1603,7 +1603,7 @@ { Lisp_Object type; structure_keyword_entry_dynarr *keywords; - int (*validate) (Lisp_Object data, Error_behavior errb); + int (*validate) (Lisp_Object data, Error_Behavior errb); Lisp_Object (*instantiate) (Lisp_Object data); }; @@ -1615,14 +1615,14 @@ struct structure_type *define_structure_type (Lisp_Object type, int (*validate) (Lisp_Object data, - Error_behavior errb), + Error_Behavior errb), Lisp_Object (*instantiate) (Lisp_Object data)); void define_structure_type_keyword (struct structure_type *st, Lisp_Object keyword, int (*validate) (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb)); + Error_Behavior errb)); /*---------------------------- weak lists ------------------------------*/ @@ -2460,18 +2460,18 @@ /* Defined in eval.c */ DECLARE_DOESNT_RETURN (signal_error_1 (Lisp_Object, Lisp_Object)); void maybe_signal_error_1 (Lisp_Object, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); Lisp_Object maybe_signal_continuable_error_1 (Lisp_Object, Lisp_Object, - Lisp_Object, Error_behavior); + Lisp_Object, Error_Behavior); DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (signal_ferror (Lisp_Object, const char *, ...), 2, 3); -void maybe_signal_ferror (Lisp_Object, Lisp_Object, Error_behavior, +void maybe_signal_ferror (Lisp_Object, Lisp_Object, Error_Behavior, const char *, ...) PRINTF_ARGS (4, 5); Lisp_Object signal_continuable_ferror (Lisp_Object, const char *, ...) PRINTF_ARGS (2, 3); Lisp_Object maybe_signal_continuable_ferror (Lisp_Object, Lisp_Object, - Error_behavior, + Error_Behavior, const char *, ...) PRINTF_ARGS (4, 5); @@ -2479,18 +2479,18 @@ DECLARE_DOESNT_RETURN (signal_error (Lisp_Object, const char *, Lisp_Object)); void maybe_signal_error (Lisp_Object, const char *, Lisp_Object, - Lisp_Object, Error_behavior); + Lisp_Object, Error_Behavior); Lisp_Object signal_continuable_error (Lisp_Object, const char *, Lisp_Object); Lisp_Object maybe_signal_continuable_error (Lisp_Object, const char *, Lisp_Object, - Lisp_Object, Error_behavior); + Lisp_Object, Error_Behavior); DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (signal_ferror_with_frob (Lisp_Object, Lisp_Object, const char *, ...), 3, 4); void maybe_signal_ferror_with_frob (Lisp_Object, Lisp_Object, Lisp_Object, - Error_behavior, + Error_Behavior, const char *, ...) PRINTF_ARGS (5, 6); Lisp_Object signal_continuable_ferror_with_frob (Lisp_Object, Lisp_Object, const char *, @@ -2498,19 +2498,19 @@ Lisp_Object maybe_signal_continuable_ferror_with_frob (Lisp_Object, Lisp_Object, Lisp_Object, - Error_behavior, + Error_Behavior, const char *, ...) PRINTF_ARGS (5, 6); DECLARE_DOESNT_RETURN (signal_error_2 (Lisp_Object, const char *, Lisp_Object, Lisp_Object)); void maybe_signal_error_2 (Lisp_Object, const char *, Lisp_Object, - Lisp_Object, Lisp_Object, Error_behavior); + Lisp_Object, Lisp_Object, Error_Behavior); Lisp_Object signal_continuable_error_2 (Lisp_Object, const char *, Lisp_Object, Lisp_Object); Lisp_Object maybe_signal_continuable_error_2 (Lisp_Object, const char *, Lisp_Object, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (signal_malformed_list_error (Lisp_Object)); @@ -2522,47 +2522,47 @@ DECLARE_DOESNT_RETURN (syntax_error_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_syntax_error (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (sferror (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (sferror_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_sferror (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (invalid_argument (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (invalid_argument_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_invalid_argument (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (invalid_operation (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (invalid_operation_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_invalid_operation (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (invalid_state (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (invalid_state_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_invalid_state (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (invalid_change (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (invalid_change_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_invalid_change (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (invalid_constant (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (invalid_constant_2 (const char *reason, Lisp_Object frob1, Lisp_Object frob2)); void maybe_invalid_constant (const char *, Lisp_Object, Lisp_Object, - Error_behavior); + Error_Behavior); DECLARE_DOESNT_RETURN (wtaerror (const char *reason, Lisp_Object frob)); DECLARE_DOESNT_RETURN (out_of_memory (const char *reason, Lisp_Object frob)); @@ -2624,7 +2624,7 @@ Lisp_Object call2_trapping_errors (const char *, Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object call_with_suspended_errors (lisp_fn_t, volatile Lisp_Object, Lisp_Object, - Error_behavior, int, ...); + Error_Behavior, int, ...); /* C Code should be using internal_catch, record_unwind_p, condition_case_1 */ Lisp_Object internal_catch (Lisp_Object, Lisp_Object (*) (Lisp_Object), Lisp_Object, int * volatile); @@ -2712,10 +2712,10 @@ void internal_plist_put (Lisp_Object *, Lisp_Object, Lisp_Object); int internal_remprop (Lisp_Object *, Lisp_Object); Lisp_Object external_plist_get (Lisp_Object *, Lisp_Object, - int, Error_behavior); + int, Error_Behavior); void external_plist_put (Lisp_Object *, Lisp_Object, - Lisp_Object, int, Error_behavior); -int external_remprop (Lisp_Object *, Lisp_Object, int, Error_behavior); + Lisp_Object, int, Error_Behavior); +int external_remprop (Lisp_Object *, Lisp_Object, int, Error_Behavior); int internal_equal (Lisp_Object, Lisp_Object, int); Lisp_Object concat2 (Lisp_Object, Lisp_Object); Lisp_Object concat3 (Lisp_Object, Lisp_Object, Lisp_Object); @@ -2726,8 +2726,8 @@ void check_losing_bytecode (const char *, Lisp_Object); /* Defined in glyphs.c */ -Error_behavior decode_error_behavior_flag (Lisp_Object); -Lisp_Object encode_error_behavior_flag (Error_behavior); +Error_Behavior decode_error_behavior_flag (Lisp_Object); +Lisp_Object encode_error_behavior_flag (Error_Behavior); /* Defined in glyphs-shared.c */ void shared_resource_validate (Lisp_Object instantiator); @@ -2877,10 +2877,10 @@ Bytind bi_find_next_emchar_in_string (Lisp_String*, Emchar, Bytind, EMACS_INT); Bufpos find_before_next_newline (struct buffer *, Bufpos, Bufpos, int); struct re_pattern_buffer *compile_pattern (Lisp_Object, struct re_registers *, - Lisp_Object, int, Error_behavior); + Lisp_Object, int, Error_Behavior); Bytecount fast_string_match (Lisp_Object, const Bufbyte *, Lisp_Object, Bytecount, - Bytecount, int, Error_behavior, int); + Bytecount, int, Error_Behavior, int); Bytecount fast_lisp_string_match (Lisp_Object, Lisp_Object); void restore_match_data (void); extern Fixnum warn_about_possibly_incompatible_back_references; @@ -2898,9 +2898,9 @@ /* Defined in specifier.c */ Lisp_Object specifier_instance (Lisp_Object, Lisp_Object, Lisp_Object, - Error_behavior, int, int, Lisp_Object); + Error_Behavior, int, int, Lisp_Object); Lisp_Object specifier_instance_no_quit (Lisp_Object, Lisp_Object, Lisp_Object, - Error_behavior, int, Lisp_Object); + Error_Behavior, int, Lisp_Object); /* Defined in symbols.c */ unsigned int hash_string (const Bufbyte *, Bytecount);
--- a/src/lread.c Fri May 25 10:04:29 2001 +0000 +++ b/src/lread.c Fri May 25 11:27:01 2001 +0000 @@ -2066,7 +2066,7 @@ struct structure_type * define_structure_type (Lisp_Object type, int (*validate) (Lisp_Object data, - Error_behavior errb), + Error_Behavior errb), Lisp_Object (*instantiate) (Lisp_Object data)) { struct structure_type st; @@ -2085,7 +2085,7 @@ define_structure_type_keyword (struct structure_type *st, Lisp_Object keyword, int (*validate) (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb)) + Error_Behavior errb)) { struct structure_keyword_entry en;
--- a/src/mule-charset.c Fri May 25 10:04:29 2001 +0000 +++ b/src/mule-charset.c Fri May 25 11:27:01 2001 +0000 @@ -784,9 +784,8 @@ if (!NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_LEFT_TO_RIGHT)) || !NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_RIGHT_TO_LEFT))) - signal_error - (Qerror, - "Character set already defined for this DIMENSION/CHARS/FINAL combo", + invalid_argument + ("Character set already defined for this DIMENSION/CHARS/FINAL combo", Qunbound); id = get_unallocated_leading_byte (dimension);
--- a/src/nt.c Fri May 25 10:04:29 2001 +0000 +++ b/src/nt.c Fri May 25 11:27:01 2001 +0000 @@ -1775,28 +1775,28 @@ #ifndef HAVE_TTY Lisp_Object tty_semi_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return Vstdio_str; } Lisp_Object tty_canonicalize_console_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return Vstdio_str; } Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return Vstdio_str; } Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection, - Error_behavior errb) + Error_Behavior errb) { return Vstdio_str; }
--- a/src/objects-gtk.c Fri May 25 10:04:29 2001 +0000 +++ b/src/objects-gtk.c Fri May 25 11:27:01 2001 +0000 @@ -73,7 +73,7 @@ int gtk_parse_nearest_color (struct device *d, GdkColor *color, Bufbyte *name, - Bytecount len, Error_behavior errb) + Bytecount len, Error_Behavior errb) { GdkColormap *cmap; GdkVisual *visual; @@ -111,7 +111,7 @@ static int gtk_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { GdkColor color; int result; @@ -215,7 +215,7 @@ static int gtk_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { GdkFont *gf; XFontStruct *xf; @@ -342,7 +342,7 @@ static Lisp_Object __gtk_list_fonts_internal (const char *pattern); static Lisp_Object -gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_behavior errb) +gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_Behavior errb) { if (NILP (FONT_INSTANCE_GTK_TRUENAME (f))) {
--- a/src/objects-gtk.h Fri May 25 10:04:29 2001 +0000 +++ b/src/objects-gtk.h Fri May 25 11:27:01 2001 +0000 @@ -47,7 +47,7 @@ int allocate_nearest_color (GdkColormap *screen_colormap, GdkVisual *visual, GdkColor *color_def); int gtk_parse_nearest_color (struct device *d, GdkColor *color, Bufbyte *name, - Bytecount len, Error_behavior errb); + Bytecount len, Error_Behavior errb); /***************************************************************************** Font-Instance
--- a/src/objects-msw.c Fri May 25 10:04:29 2001 +0000 +++ b/src/objects-msw.c Fri May 25 11:27:01 2001 +0000 @@ -1169,7 +1169,7 @@ static int mswindows_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { const char *extname; COLORREF color; @@ -1264,7 +1264,7 @@ static int initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, Lisp_Object device_font_list, HDC hdc, - Error_behavior errb) + Error_Behavior errb) { const char *extname; LOGFONT logfont; @@ -1537,7 +1537,7 @@ static int mswindows_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { HDC hdc = CreateCompatibleDC (NULL); Lisp_Object font_list = DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device)); @@ -1548,7 +1548,7 @@ static int msprinter_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { HDC hdc = DEVICE_MSPRINTER_HDC (XDEVICE (device)); Lisp_Object font_list = DEVICE_MSPRINTER_FONTLIST (XDEVICE (device)); @@ -1622,7 +1622,7 @@ * Missing parts of the font spec should be filled in with these values: * Courier New:Regular:10::Western */ static Lisp_Object -mswindows_font_instance_truename (Lisp_Font_Instance *f, Error_behavior errb) +mswindows_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb) { int nsep=0; char *name = (char *) XSTRING_DATA (f->name);
--- a/src/objects-tty.c Fri May 25 10:04:29 2001 +0000 +++ b/src/objects-tty.c Fri May 25 11:27:01 2001 +0000 @@ -144,7 +144,7 @@ static int tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { Lisp_Object result; @@ -215,7 +215,7 @@ static int tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { Bufbyte *str = XSTRING_DATA (name); Lisp_Object charset = Qnil;
--- a/src/objects-x.c Fri May 25 10:04:29 2001 +0000 +++ b/src/objects-x.c Fri May 25 11:27:01 2001 +0000 @@ -226,7 +226,7 @@ static int x_parse_nearest_color (struct device *d, XColor *color, Lisp_Object name, - Error_behavior errb) + Error_Behavior errb) { Display *dpy = DEVICE_X_DISPLAY (d); Colormap cmap = DEVICE_X_COLORMAP (d); @@ -259,7 +259,7 @@ static int x_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { XColor color; int result; @@ -364,7 +364,7 @@ static int x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_Behavior errb) { Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device)); XFontStruct *xf; @@ -774,7 +774,7 @@ } static Lisp_Object -x_font_instance_truename (Lisp_Font_Instance *f, Error_behavior errb) +x_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb) { struct device *d = XDEVICE (f->device);
--- a/src/objects.c Fri May 25 10:04:29 2001 +0000 +++ b/src/objects.c Fri May 25 11:27:01 2001 +0000 @@ -234,7 +234,7 @@ Lisp_Object Qfont_instancep; static Lisp_Object font_instance_truename_internal (Lisp_Object xfont, - Error_behavior errb); + Error_Behavior errb); static Lisp_Object mark_font_instance (Lisp_Object obj) @@ -320,7 +320,7 @@ Lisp_Font_Instance *f; Lisp_Object val; int retval = 0; - Error_behavior errb = decode_error_behavior_flag (noerror); + Error_Behavior errb = decode_error_behavior_flag (noerror); if (ERRB_EQ (errb, ERROR_ME)) CHECK_STRING (name); @@ -415,7 +415,7 @@ static Lisp_Object font_instance_truename_internal (Lisp_Object font_instance, - Error_behavior errb) + Error_Behavior errb) { Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance);
--- a/src/process-unix.c Fri May 25 10:04:29 2001 +0000 +++ b/src/process-unix.c Fri May 25 11:27:01 2001 +0000 @@ -441,7 +441,7 @@ #ifndef USE_GETADDRINFO static int get_internet_address (Lisp_Object host, struct sockaddr_in *address, - Error_behavior errb) + Error_Behavior errb) { struct hostent *host_info_ptr = NULL; #ifdef TRY_AGAIN @@ -1591,7 +1591,7 @@ retval = getaddrinfo (ext_host, NULL, &hints, &res); if (retval != 0) { - char *gai_error; + Bufbyte *gai_error; EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_error, Qnative); maybe_signal_error (Qio_error, gai_error, host, @@ -1685,7 +1685,7 @@ retval = getaddrinfo (ext_host, portstring, &hints, &res); if (retval != 0) { - char *gai_error; + Bufbyte *gai_error; EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_error, Qnative); signal_error (Qio_error, gai_error, list2 (host, service));
--- a/src/rangetab.c Fri May 25 10:04:29 2001 +0000 +++ b/src/rangetab.c Fri May 25 11:27:01 2001 +0000 @@ -495,7 +495,7 @@ static int rangetab_data_validate (Lisp_Object keyword, Lisp_Object value, - Error_behavior errb) + Error_Behavior errb) { Lisp_Object rest;
--- a/src/search.c Fri May 25 10:04:29 2001 +0000 +++ b/src/search.c Fri May 25 11:27:01 2001 +0000 @@ -143,7 +143,7 @@ static int compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, Lisp_Object translate, struct re_registers *regp, int posix, - Error_behavior errb) + Error_Behavior errb) { const char *val; reg_syntax_t old; @@ -181,7 +181,7 @@ struct re_pattern_buffer * compile_pattern (Lisp_Object pattern, struct re_registers *regp, - Lisp_Object translate, int posix, Error_behavior errb) + Lisp_Object translate, int posix, Error_Behavior errb) { struct regexp_cache *cp, **cpp; @@ -461,7 +461,7 @@ fast_string_match (Lisp_Object regexp, const Bufbyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int case_fold_search, - Error_behavior errb, int no_quit) + Error_Behavior errb, int no_quit) { /* This function has been Mule-ized, except for the trt table handling. */ Bytecount val;
--- a/src/sound.h Fri May 25 10:04:29 2001 +0000 +++ b/src/sound.h Fri May 25 11:27:01 2001 +0000 @@ -31,8 +31,8 @@ # define sound_perror(string) \ do { \ - char *errmess; \ - char *string_int; \ + Bufbyte *errmess; \ + Bufbyte *string_int; \ /* #### fix this to GET_STRERROR in my mule ws */ \ EXTERNAL_TO_C_STRING (strerror (errno), errmess, Qnative); \ EXTERNAL_TO_C_STRING (string, string_int, Qnative); \ @@ -40,7 +40,7 @@ } while (0) # define sound_warn(string) \ do { \ - char *string_int; \ + Bufbyte *string_int; \ EXTERNAL_TO_C_STRING (GETTEXT (string), string_int, Qnative); \ warn_when_safe (Qsound, Qwarning, "audio: %s", string_int); \ } while (0)
--- a/src/specifier.c Fri May 25 10:04:29 2001 +0000 +++ b/src/specifier.c Fri May 25 11:27:01 2001 +0000 @@ -419,7 +419,7 @@ /************************************************************************/ static struct specifier_methods * -decode_specifier_type (Lisp_Object type, Error_behavior errb) +decode_specifier_type (Lisp_Object type, Error_Behavior errb) { int i; @@ -1160,7 +1160,7 @@ static Lisp_Object check_valid_instantiator (Lisp_Object instantiator, struct specifier_methods *meths, - Error_behavior errb) + Error_Behavior errb) { if (meths->validate_method) { @@ -1215,7 +1215,7 @@ static Lisp_Object check_valid_inst_list (Lisp_Object inst_list, struct specifier_methods *meths, - Error_behavior errb) + Error_Behavior errb) { Lisp_Object rest; @@ -1274,7 +1274,7 @@ static Lisp_Object check_valid_spec_list (Lisp_Object spec_list, struct specifier_methods *meths, - Error_behavior errb) + Error_Behavior errb) { Lisp_Object rest; @@ -2352,7 +2352,7 @@ static Lisp_Object check_valid_specifier_matchspec (Lisp_Object matchspec, struct specifier_methods *meths, - Error_behavior errb) + Error_Behavior errb) { if (meths->validate_matchspec_method) { @@ -2467,7 +2467,7 @@ Lisp_Object matchspec, Lisp_Object domain, Lisp_Object inst_list, - Error_behavior errb, int no_quit, + Error_Behavior errb, int no_quit, Lisp_Object depth) { /* This function can GC */ @@ -2545,7 +2545,7 @@ triggered by a user call, who knows what it will usually be. */ Lisp_Object specifier_instance (Lisp_Object specifier, Lisp_Object matchspec, - Lisp_Object domain, Error_behavior errb, int no_quit, + Lisp_Object domain, Error_Behavior errb, int no_quit, int no_fallback, Lisp_Object depth) { Lisp_Object buffer = Qnil; @@ -2645,7 +2645,7 @@ Lisp_Object specifier_instance_no_quit (Lisp_Object specifier, Lisp_Object matchspec, - Lisp_Object domain, Error_behavior errb, + Lisp_Object domain, Error_Behavior errb, int no_fallback, Lisp_Object depth) { return specifier_instance (specifier, matchspec, domain, errb,
--- a/src/toolbar.c Fri May 25 10:04:29 2001 +0000 +++ b/src/toolbar.c Fri May 25 11:27:01 2001 +0000 @@ -950,7 +950,7 @@ /* Returns Q_style if key was :style, Qt if ok otherwise, Qnil if error. */ static Lisp_Object check_toolbar_button_keywords (Lisp_Object button, Lisp_Object key, - Lisp_Object val, Error_behavior errb) + Lisp_Object val, Error_Behavior errb) { if (!KEYWORDP (key)) { @@ -994,7 +994,7 @@ { Lisp_Object *elt, glyphs, value; int len; - Error_behavior errb = decode_error_behavior_flag (noerror); + Error_Behavior errb = decode_error_behavior_flag (noerror); if (!VECTORP (button)) CTB_ERROR ("toolbar button descriptors must be vectors");
--- a/src/tooltalk.c Fri May 25 10:04:29 2001 +0000 +++ b/src/tooltalk.c Fri May 25 11:27:01 2001 +0000 @@ -301,7 +301,7 @@ { if (tt_is_err (st)) { - char *err; + Bufbyte *err; EXTERNAL_TO_C_STRING (tt_status_message (st), err, Qnative); signal_error (Qtooltalk_error, err, Qunbound);
--- a/src/win32.c Fri May 25 10:04:29 2001 +0000 +++ b/src/win32.c Fri May 25 11:27:01 2001 +0000 @@ -84,7 +84,7 @@ Lisp_Object tstr_to_local_file_format (Extbyte *pathout) { - char *ttlff; + Bufbyte *ttlff; Lisp_Object in; EXTERNAL_TO_C_STRING (pathout, ttlff, Qmswindows_tstr);
--- a/src/window.c Fri May 25 10:04:29 2001 +0000 +++ b/src/window.c Fri May 25 11:27:01 2001 +0000 @@ -4223,7 +4223,7 @@ the top clip. */ void window_scroll (Lisp_Object window, Lisp_Object count, int direction, - Error_behavior errb) + Error_Behavior errb) { struct window *w = XWINDOW (window); struct buffer *b = XBUFFER (w->buffer);
--- a/src/window.h Fri May 25 10:04:29 2001 +0000 +++ b/src/window.h Fri May 25 11:27:01 2001 +0000 @@ -366,7 +366,7 @@ void set_window_pixwidth (Lisp_Object window, int pixwidth, int nodelete); void window_scroll (Lisp_Object window, Lisp_Object n, int direction, - Error_behavior errb); + Error_Behavior errb); int buffer_window_count (struct buffer *b, struct frame *f); int buffer_window_mru (struct window *w); void check_frame_size (struct frame *frame, int *rows, int *cols);