mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-02 18:21:19 -08:00
* globals.h: New file. * xterm.h (Vx_pixel_size_width_font_regexp): Remove declaration. * window.h (Vinitial_window_system, Vminibuf_scroll_window) (Vwindow_system_version): Remove declaration. * w32term.h (Vw32_enable_palette) (Vx_pixel_size_width_font_regexp): Remove declaration. * w32menu.c (Voverriding_local_map) (Voverriding_local_map_menu_flag): Remove declaration. * w32inevt.c (Vw32_alt_is_meta, Vw32_apps_modifier) (Vw32_capslock_is_shiftlock, Vw32_enable_caps_lock) (Vw32_enable_num_lock, Vw32_lwindow_modifier) (Vw32_pass_lwindow_to_system, Vw32_pass_rwindow_to_system) (Vw32_phantom_key_code, Vw32_recognize_altgr) (Vw32_rwindow_modifier, Vw32_scroll_lock_modifier) (w32_use_full_screen_buffer): Remove declaration. * w32.c (Vsystem_configuration, Vw32_downcase_file_names) (Vw32_generate_fake_inodes, Vw32_get_true_file_attributes) (w32_num_mouse_buttons, w32_pipe_read_delay): Remove declaration. * termopts.h (Vtruncate_partial_width_windows, inverse_video) (no_redraw_on_reenter, visible_bell): Remove declaration. * sysdep.c (Vsystem_name): Remove declaration. * syntax.h (parse_sexp_lookup_properties): Remove declaration. * menu.h (Vmenu_updating_frame): Remove declaration. * macros.h (Vexecuting_kbd_macro, executing_kbd_macro_index): Remove declaration. * lisp.h (Vafter_init_time, Vafter_load_alist) (Vauto_save_list_file_name, Vbefore_init_time, Vcommand_history) (Vcompletion_regexp_list, Vcurrent_load_list) (Vcurrent_prefix_arg, Vdata_directory, Vdebug_on_error) (Vdoc_directory, Vdoc_file_name, Vdynamic_library_alist) (Vexec_directory, Vexec_path, Vexec_suffixes) (Vface_font_rescale_alist, Vface_ignored_fonts, Vfeatures) (Vhelp_form, Vhistory_length, Vinhibit_field_text_motion) (Vinhibit_quit, Vinhibit_read_only, Vinhibit_redisplay) (Vinstallation_directory, Vinvocation_directory) (Vinvocation_name, Vload_file_rep_suffixes, Vload_history) (Vload_suffixes, Vmark_even_if_inactive, Vmemory_full) (Vmessage_log_max, Vobarray, Vprint_length, Vprint_level) (Vpurify_flag, Vquit_flag, Vsaved_region_selection) (Vscalable_fonts_allowed, Vselect_active_regions) (Vshell_file_name, Vstandard_input, Vstandard_output) (Vsystem_name, Vtemporary_file_directory, Vthrow_on_input) (Vtop_level, Vtty_erase_char, Vundo_outer_limit) (Vuser_login_name, Vwindow_scroll_functions) (Vwindow_system_version, Vx_no_window_manager) (Vx_resource_class, Vx_resource_name, baud_rate) (completion_ignore_case, debug_on_next_call, gc_cons_threshold) (history_delete_duplicates, inhibit_x_resources) (last_nonmenu_event, load_in_progress, max_specpdl_size) (minibuffer_auto_raise, print_escape_newlines, scroll_margin) (use_dialog_box, use_file_dialog): Remove declaration. Include globals.h. * keymap.h (Voverriding_local_map) (Voverriding_local_map_menu_flag, meta_prefix_char): Remove declaration. * keyboard.h (Vdouble_click_time, Vfunction_key_map) (Vinput_method_function, Vkey_translation_map) (Vlucid_menu_bar_dirty_flag, Vthis_original_command) (do_mouse_tracking, extra_keyboard_modifiers) (num_nonmacro_input_events): Remove declaration. * intervals.h (Vchar_property_alias_alist) (Vdefault_text_properties, Vinhibit_point_motion_hooks) (Vtext_property_default_nonsticky): Remove declaration. * gtkutil.h (x_gtk_file_dialog_help_text) (x_gtk_show_hidden_files, x_gtk_use_old_file_dialog) (x_gtk_whole_detached_tool_bar): Remove declaration. * frame.h (Vdefault_frame_alist, Vframe_alpha_lower_limit) (Vmenu_bar_mode, Vmouse_highlight, Vterminal_frame) (Vtool_bar_mode, Vx_resource_class, Vx_resource_name) (focus_follows_mouse): Remove declaration. * fontset.h (Valternate_fontname_alist, Vfontset_alias_alist) (Vignore_relative_composition, Votf_script_alist) (Vuse_default_ascent, Vvertical_centering_font_regexp): Remove declaration. * font.h (Vfont_log): Remove declaration. * dosfns.h (Vdos_display_scancodes, Vdos_version) (Vdos_windows_version, dos_codepage, dos_country_code) (dos_decimal_point, dos_hyper_key, dos_keyboard_layout) (dos_keypad_mode, dos_super_key, dos_timezone_offset): Remove declaration. * disptab.h (Vglyph_table, Vstandard_display_table): Remove declaration. * dispextern.h (Vface_remapping_alist, Vglyphless_char_display) (Vmouse_autoselect_window, Voverflow_newline_into_fringe) (Vshow_trailing_whitespace, Vtool_bar_button_margin) (Vtool_bar_style, cursor_in_echo_area, display_hourglass_p) (inverse_video, mode_line_in_non_selected_windows) (tool_bar_button_relief, tool_bar_max_label_size) (underline_minimum_offset) (unibyte_display_via_language_environment, x_stretch_cursor_p): Remove declaration. * composite.h (Vauto_composition_function) (Vcomposition_function_table): Remove declaration. * commands.h (Vexecuting_kbd_macro) (Vminibuffer_local_completion_map) (Vminibuffer_local_filename_completion_map) (Vminibuffer_local_filename_must_match_map) (Vminibuffer_local_map, Vminibuffer_local_must_match_map) (Vminibuffer_local_ns_map, Vthis_command) (Vunread_command_events, cursor_in_echo_area) (last_command_event, last_nonmenu_event, unread_command_char): Remove declaration. * coding.h (Vcoding_system_for_read, Vcoding_system_for_write) (Vdefault_file_name_coding_system) (Vdefault_process_coding_system, Vfile_name_coding_system) (Vlast_coding_system_used, Vlocale_coding_system) (Vselect_safe_coding_system_function) (Vtranslation_table_for_input, coding_system_require_warning) (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided) (eol_mnemonic_unix, inherit_process_coding_system): Remove declaration. * charset.h (Vcharset_list, Vcurrent_iso639_language): Remove declaration. * character.h (Vauto_fill_chars, Vchar_direction_table) (Vchar_script_table, Vchar_width_table, Vprintable_chars) (Vscript_representative_chars, Vtranslation_table_vector) (Vunicode_category_table): Remove declaration. * ccl.h (Vfont_ccl_encoder_alist): Remove declaration. * buffer.h (Vafter_change_functions, Vbefore_change_functions) (Vdeactivate_mark, Vfirst_change_hook, Vtransient_mark_mode) (inhibit_modification_hooks): Remove declaration. * xterm.c (syms_of_xterm): Update. (Vx_alt_keysym, Vx_hyper_keysym, Vx_keysym_table) (Vx_meta_keysym, Vx_super_keysym, Vx_toolkit_scroll_bars) (x_mouse_click_focus_ignore_position) (x_underline_at_descent_line) (x_use_underline_position_properties): Remove. * xsmfns.c (syms_of_xsmfns): Update. (Vx_session_id, Vx_session_previous_id): Remove. * xsettings.c (syms_of_xsettings): Update. (Vxft_settings, use_system_font): Remove. * xselect.c (syms_of_xselect): Update. (Vselection_converter_alist, Vx_lost_selection_functions) (Vx_sent_selection_functions, x_selection_timeout): Remove. * xfns.c (syms_of_xfns): Update. (Vgtk_version_string, Vmotif_version_string) (Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape) (Vx_max_tooltip_size, Vx_mode_pointer_shape) (Vx_no_window_manager, Vx_nontext_pointer_shape) (Vx_pixel_size_width_font_regexp, Vx_pointer_shape) (Vx_sensitive_text_pointer_shape) (Vx_window_horizontal_drag_shape, x_gtk_file_dialog_help_text) (x_gtk_show_hidden_files, x_gtk_use_old_file_dialog) (x_gtk_use_system_tooltips, x_gtk_whole_detached_tool_bar): Remove. * xfaces.c (syms_of_xfaces): Update. (Vface_default_stipple, Vface_font_rescale_alist) (Vface_ignored_fonts, Vface_new_frame_defaults) (Vface_remapping_alist, Vfont_list_limit) (Vscalable_fonts_allowed, Vtty_defined_color_alist): Remove. * xdisp.c (syms_of_xdisp): Update. (Vauto_resize_tool_bars, Vblink_cursor_alist) (Vdisplay_pixels_per_inch, Vfontification_functions) (Vframe_title_format, Vglobal_mode_string) (Vglyphless_char_display, Vhourglass_delay, Vhscroll_step) (Vicon_title_format, Vinhibit_redisplay) (Vline_number_display_limit, Vline_prefix) (Vmax_mini_window_height, Vmenu_bar_update_hook) (Vmenu_updating_frame, Vmessage_log_max) (Vmouse_autoselect_window, Vnobreak_char_display) (Voverlay_arrow_position, Voverlay_arrow_string) (Voverlay_arrow_variable_list, Vredisplay_end_trigger_functions) (Vresize_mini_windows, Vshow_trailing_whitespace) (Vtool_bar_border, Vtool_bar_button_margin, Vtool_bar_style) (Vtruncate_partial_width_windows, Vvoid_text_area_pointer) (Vwindow_scroll_functions, Vwindow_size_change_functions) (Vwindow_text_change_functions, Vwrap_prefix) (auto_raise_tool_bar_buttons_p, automatic_hscrolling_p) (debug_end_pos, display_hourglass_p, emacs_scroll_step) (highlight_nonselected_windows, hscroll_margin) (inhibit_eval_during_redisplay, inhibit_free_realized_faces) (inhibit_menubar_update, inhibit_try_cursor_movement) (inhibit_try_window_id, inhibit_try_window_reusing) (line_number_display_limit_width) (make_cursor_line_fully_visible_p, message_truncate_lines) (mode_line_inverse_video, multiple_frames, overline_margin) (scroll_conservatively, scroll_margin, tool_bar_button_relief) (tool_bar_max_label_size, underline_minimum_offset) (unibyte_display_via_language_environment, x_stretch_cursor_p): Remove. * window.c (syms_of_window): Update. (Vminibuf_scroll_window, Vother_window_scroll_buffer) (Vrecenter_redisplay, Vscroll_preserve_screen_position) (Vtemp_buffer_show_function, Vwindow_configuration_change_hook) (Vwindow_point_insertion_type, auto_window_vscroll_p) (mode_line_in_non_selected_windows, next_screen_context_lines) (window_min_height, window_min_width): Remove. (scroll_margin): Remove declaration. * w32term.c (syms_of_w32term): Update. (Vw32_capslock_is_shiftlock, Vw32_grab_focus_on_raise) (Vw32_recognize_altgr, Vw32_swap_mouse_buttons) (Vx_toolkit_scroll_bars, w32_num_mouse_buttons) (w32_use_visible_system_caret, x_underline_at_descent_line) (x_use_underline_position_properties): Remove. (Vcommand_line_args, Vsystem_name, extra_keyboard_modifiers): Remove declaration. * w32select.c (syms_of_w32select): Update. (Vnext_selection_coding_system, Vselection_coding_system): Remove. * w32proc.c (syms_of_ntproc): Update. (Vw32_downcase_file_names, Vw32_generate_fake_inodes) (Vw32_get_true_file_attributes, Vw32_quote_process_args) (Vw32_start_process_inherit_error_mode) (Vw32_start_process_share_console) (Vw32_start_process_show_window, w32_pipe_read_delay): Remove. (Vsystem_name): Remove declaration. * w32font.c (syms_of_w32font): Update. (Vw32_charset_info_alist): Remove. * w32fns.c (globals_of_w32fns, syms_of_w32fns): Update. (Vw32_alt_is_meta, Vw32_apps_modifier, Vw32_bdf_filename_alist) (Vw32_color_map, Vw32_enable_caps_lock, Vw32_enable_num_lock) (Vw32_enable_palette, Vw32_lwindow_modifier) (Vw32_pass_alt_to_system, Vw32_pass_lwindow_to_system) (Vw32_pass_rwindow_to_system, Vw32_phantom_key_code) (Vw32_rwindow_modifier, Vw32_scroll_lock_modifier) (Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape) (Vx_max_tooltip_size, Vx_mode_pointer_shape) (Vx_no_window_manager, Vx_nontext_pointer_shape) (Vx_pixel_size_width_font_regexp, Vx_pointer_shape) (Vx_sensitive_text_pointer_shape) (Vx_window_horizontal_drag_shape, w32_ansi_code_page) (w32_enable_synthesized_fonts, w32_mouse_button_tolerance) (w32_mouse_move_interval) (w32_pass_extra_mouse_buttons_to_system) (w32_pass_multimedia_buttons_to_system, w32_quit_key) (w32_strict_fontnames, w32_strict_painting): Remove. (Vhourglass_delay, Vmenu_bar_mode, Vtool_bar_mode) (Vw32_recognize_altgr, Vwindow_system_version) (w32_num_mouse_buttons, w32_use_visible_system_caret): Remove declaration. * w32console.c (syms_of_ntterm): Update. (w32_use_full_screen_buffer): Remove. (Vtty_defined_color_alist): Remove declaration. * w16select.c (syms_of_win16select): Update. (Vnext_selection_coding_system, Vselection_coding_system): Remove. * undo.c (syms_of_undo): Update. (Vundo_outer_limit, Vundo_outer_limit_function) (undo_inhibit_record_point, undo_limit, undo_strong_limit): Remove. * textprop.c (syms_of_textprop): Update. (Vchar_property_alias_alist, Vdefault_text_properties) (Vinhibit_point_motion_hooks, Vtext_property_default_nonsticky): Remove. * terminal.c (syms_of_terminal): Update. (Vdelete_terminal_functions, Vring_bell_function): Remove. * term.c (syms_of_term): Update. (Vresume_tty_functions, Vsuspend_tty_functions) (no_redraw_on_reenter, system_uses_terminfo, visible_cursor): Remove. * syntax.c (syms_of_syntax): Update. (Vfind_word_boundary_function_table, multibyte_syntax_as_symbol) (open_paren_in_column_0_is_defun_start) (parse_sexp_ignore_comments, parse_sexp_lookup_properties) (words_include_escapes): Remove. * search.c (syms_of_search): Update. (Vinhibit_changing_match_data, Vsearch_spaces_regexp): Remove. * process.c (syms_of_process): Update. (Vprocess_adaptive_read_buffering, Vprocess_connection_type) (delete_exited_processes): Remove. * print.c (syms_of_print): Update. (Vfloat_output_format, Vprint_charset_text_property) (Vprint_circle, Vprint_continuous_numbering, Vprint_gensym) (Vprint_length, Vprint_level, Vprint_number_table) (Vstandard_output, print_escape_multibyte) (print_escape_newlines, print_escape_nonascii, print_quoted): Remove. * msdos.c (syms_of_msdos): Update. (Vdos_unsupported_char_glyph): Remove. (unibyte_display_via_language_environment): Remove declaration. * minibuf.c (syms_of_minibuf): Update. (Vcompletion_regexp_list, Vhistory_add_new_input) (Vhistory_length, Vminibuffer_completing_file_name) (Vminibuffer_completion_confirm) (Vminibuffer_completion_predicate, Vminibuffer_completion_table) (Vminibuffer_exit_hook, Vminibuffer_help_form) (Vminibuffer_history_position, Vminibuffer_history_variable) (Vminibuffer_prompt_properties, Vminibuffer_setup_hook) (Vread_buffer_function, Vread_expression_map) (completion_ignore_case, enable_recursive_minibuffers) (history_delete_duplicates, minibuffer_allow_text_properties) (minibuffer_auto_raise, read_buffer_completion_ignore_case): Remove. * marker.c (syms_of_marker): Update. (byte_debug_flag): Remove. * macros.c (syms_of_macros): Update. (Vexecuting_kbd_macro, executing_kbd_macro_index): Remove. * lread.c (syms_of_lread): Update. (Vafter_load_alist, Vbyte_boolean_vars) (Vbytecomp_version_regexp, Vcurrent_load_list) (Veval_buffer_list, Vload_file_name, Vload_file_rep_suffixes) (Vload_history, Vload_path, Vload_read_function) (Vload_source_file_function, Vload_suffixes, Vobarray) (Vold_style_backquotes, Vpreloaded_file_list, Vread_circle) (Vread_symbol_positions_list, Vread_with_symbol_positions) (Vsource_directory, Vstandard_input, Vuser_init_file, Vvalues) (force_load_messages, load_convert_to_unibyte) (load_dangerous_libraries, load_force_doc_strings) (load_in_progress): Remove. * keymap.c (syms_of_keymap): Update. (Vdefine_key_rebound_commands, Vemulation_mode_map_alists) (Vminibuffer_local_completion_map) (Vminibuffer_local_filename_completion_map) (Vminibuffer_local_filename_must_match_map) (Vminibuffer_local_map, Vminibuffer_local_must_match_map) (Vminibuffer_local_ns_map, Vminor_mode_map_alist) (Vminor_mode_overriding_map_alist, Vwhere_is_preferred_modifier): Remove. * keyboard.c (syms_of_keyboard): Update. (Vauto_save_timeout, Vcommand_error_function) (Vcommand_hook_internal, Vdeactivate_mark) (Vdeferred_action_function, Vdeferred_action_list) (Vdisable_point_adjustment, Vdouble_click_time) (Vecho_keystrokes, Venable_disabled_menus_and_buttons) (Vfunction_key_map, Vglobal_disable_point_adjustment) (Vhelp_char, Vhelp_event_list, Vhelp_form) (Vinput_method_function, Vinput_method_previous_message) (Vkey_translation_map, Vlast_event_frame) (Vlucid_menu_bar_dirty_flag, Vmenu_bar_final_items) (Vminibuffer_message_timeout, Voverriding_local_map) (Voverriding_local_map_menu_flag, Vpost_command_hook) (Vpre_command_hook, Vprefix_help_command) (Vsaved_region_selection, Vselect_active_regions) (Vshow_help_function, Vspecial_event_map, Vsuggest_key_bindings) (Vthis_command, Vthis_command_keys_shift_translated) (Vthis_original_command, Vthrow_on_input, Vtimer_idle_list) (Vtimer_list, Vtool_bar_separator_image_expression, Vtop_level) (Vtty_erase_char, Vunread_command_events) (Vunread_input_method_events, Vunread_post_input_method_events) (auto_save_interval, cannot_suspend, do_mouse_tracking) (double_click_fuzz, extra_keyboard_modifiers) (inhibit_local_menu_bar_menus, last_command_event) (last_input_event, last_nonmenu_event, menu_prompt_more_char) (menu_prompting, meta_prefix_char, num_input_keys) (num_nonmacro_input_events, polling_period, unread_command_char): Remove. * insdel.c (syms_of_insdel): Update. (Vcombine_after_change_calls, check_markers_debug_flag): Remove. * indent.c (syms_of_indent): Update. (indent_tabs_mode): Remove. * image.c (syms_of_image): Update. (Vimage_cache_eviction_delay, Vimage_types) (Vimagemagick_render_type, Vmax_image_size, Vx_bitmap_file_path) (cross_disabled_images): Remove. * fringe.c (syms_of_fringe): Update. (Vfringe_bitmaps, Voverflow_newline_into_fringe): Remove. * frame.c (syms_of_frame): Update. (Vdefault_frame_alist, Vdefault_frame_scroll_bars) (Vdelete_frame_functions, Vframe_alpha_lower_limit) (Vmake_pointer_invisible, Vmenu_bar_mode, Vmouse_highlight) (Vmouse_position_function, Vterminal_frame, Vtool_bar_mode) (Vx_resource_class, Vx_resource_name, focus_follows_mouse): Remove. * fontset.c (syms_of_fontset): Update. (Valternate_fontname_alist, Vfont_encoding_charset_alist) (Vfontset_alias_alist, Vignore_relative_composition) (Votf_script_alist, Vuse_default_ascent) (Vvertical_centering_font_regexp): Remove. * font.c (syms_of_font): Update. (Vfont_encoding_alist, Vfont_log, Vfont_slant_table) (Vfont_weight_table, Vfont_width_table): Remove. * fns.c (syms_of_fns): Update. (Vfeatures, use_dialog_box, use_file_dialog): Remove. * filelock.c (syms_of_filelock): Update. (Vtemporary_file_directory): Remove. * fileio.c (syms_of_fileio): Update. (Vafter_insert_file_functions, Vauto_save_include_big_deletions) (Vauto_save_list_file_name, Vauto_save_visited_file_name) (Vdefault_file_name_coding_system, Vfile_name_coding_system) (Vfile_name_handler_alist, Vinhibit_file_name_handlers) (Vinhibit_file_name_operation, Vset_auto_coding_function) (Vwrite_region_annotate_functions) (Vwrite_region_annotations_so_far) (Vwrite_region_post_annotation_function) (delete_by_moving_to_trash, write_region_inhibit_fsync): Remove. (Vw32_get_true_file_attributes): Remove declaration. * eval.c (syms_of_eval): Update. (Vdebug_ignored_errors, Vdebug_on_error, Vdebug_on_signal) (Vdebugger, Vinhibit_quit, Vmacro_declaration_function) (Vquit_flag, Vsignal_hook_function, Vstack_trace_on_error) (debug_on_next_call, debug_on_quit, debugger_may_continue) (max_lisp_eval_depth, max_specpdl_size): Remove. * emacs.c (syms_of_emacs): Update. (Vafter_init_time, Vbefore_init_time, Vcommand_line_args) (Vdynamic_library_alist, Vemacs_copyright, Vemacs_version) (Vinstallation_directory, Vinvocation_directory) (Vinvocation_name, Vkill_emacs_hook, Vpath_separator) (Vprevious_system_messages_locale, Vprevious_system_time_locale) (Vsystem_configuration, Vsystem_configuration_options) (Vsystem_messages_locale, Vsystem_time_locale, Vsystem_type) (inhibit_x_resources, noninteractive1): Remove. * editfns.c (syms_of_editfns): Update. (Vbuffer_access_fontified_property) (Vbuffer_access_fontify_functions, Vinhibit_field_text_motion) (Voperating_system_release, Vsystem_name, Vuser_full_name) (Vuser_login_name, Vuser_real_login_name): Remove. * dosfns.c (syms_of_dosfns): Update. (Vdos_display_scancodes, Vdos_version, Vdos_windows_version) (dos_codepage, dos_country_code, dos_decimal_point) (dos_hyper_key, dos_keyboard_layout, dos_keypad_mode) (dos_super_key, dos_timezone_offset): Remove. * doc.c (syms_of_doc): Update. (Vbuild_files, Vdoc_file_name): Remove. * dispnew.c (syms_of_display): Update. (Vglyph_table, Vinitial_window_system) (Vredisplay_preemption_period, Vstandard_display_table) (Vwindow_system_version, baud_rate, cursor_in_echo_area) (inverse_video, redisplay_dont_pause, visible_bell): Remove. * dired.c (syms_of_dired): Update. (Vcompletion_ignored_extensions): Remove. (Vw32_get_true_file_attributes): Remove declaration. * dbusbind.c (syms_of_dbusbind): Update. (Vdbus_debug, Vdbus_registered_buses) (Vdbus_registered_objects_table): Remove. * data.c (syms_of_data): Update. (Vmost_negative_fixnum, Vmost_positive_fixnum): Remove. * composite.c (syms_of_composite): Update. (Vauto_composition_function, Vauto_composition_mode) (Vcompose_chars_after_function, Vcomposition_function_table): Remove. * coding.c (syms_of_coding): Update. (Vcharset_revision_table, Vcoding_category_list) (Vcoding_system_alist, Vcoding_system_for_read) (Vcoding_system_for_write, Vcoding_system_list) (Vdefault_process_coding_system, Venable_character_translation) (Vfile_coding_system_alist, Vlast_code_conversion_error) (Vlast_coding_system_used, Vlatin_extra_code_table) (Vlocale_coding_system, Vnetwork_coding_system_alist) (Vprocess_coding_system_alist) (Vselect_safe_coding_system_function) (Vstandard_translation_table_for_decode) (Vstandard_translation_table_for_encode) (Vtranslation_table_for_input, coding_system_require_warning) (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided) (eol_mnemonic_unix, inherit_process_coding_system) (inhibit_eol_conversion, inhibit_iso_escape_detection) (inhibit_null_byte_detection): Remove. * cmds.c (syms_of_cmds): Update. (Vpost_self_insert_hook): Remove. * charset.c (syms_of_charset): Update. (Vcharset_list, Vcharset_map_path, Vcurrent_iso639_language) (inhibit_load_charset_map): Remove. * character.c (syms_of_character): Update. (Vauto_fill_chars, Vchar_direction_table, Vchar_script_table) (Vchar_width_table, Vprintable_chars) (Vscript_representative_chars, Vtranslation_table_vector) (Vunicode_category_table): Remove. * ccl.c (syms_of_ccl): Update. (Vcode_conversion_map_vector, Vfont_ccl_encoder_alist) (Vtranslation_hash_table_vector): Remove. * category.c (syms_of_category): Update. (Vword_combining_categories, Vword_separating_categories): Remove. * callproc.c (syms_of_callproc): Update. (Vconfigure_info_directory, Vdata_directory, Vdoc_directory) (Vexec_directory, Vexec_path, Vexec_suffixes) (Vinitial_environment, Vprocess_environment) (Vshared_game_score_directory, Vshell_file_name): Remove. * callint.c (syms_of_callint): Update. (Vcommand_debug_status, Vcommand_history, Vcurrent_prefix_arg) (Vmark_even_if_inactive, Vmouse_leave_buffer_hook): Remove. * bytecode.c (syms_of_bytecode): Update. (Vbyte_code_meter, byte_metering_on): Remove. * buffer.c (syms_of_buffer): Update. (Vafter_change_functions, Vbefore_change_functions) (Vchange_major_mode_hook, Vfirst_change_hook) (Vinhibit_read_only, Vkill_buffer_query_functions) (Vtransient_mark_mode, inhibit_modification_hooks): Remove. * alloc.c (syms_of_alloc): Update. (Vgc_cons_percentage, Vgc_elapsed, Vmemory_full) (Vmemory_signal_data, Vpost_gc_hook, Vpurify_flag) (cons_cells_consed, floats_consed, garbage_collection_messages) (gc_cons_threshold, gcs_done, intervals_consed) (misc_objects_consed, pure_bytes_used, string_chars_consed) (strings_consed, symbols_consed, vector_cells_consed): Remove. * lisp.h (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL) (DEFVAR_INT): Assume global is in `globals'. * alloc.c (globals): Define.
633 lines
20 KiB
C
633 lines
20 KiB
C
/* Header for multibyte character handler.
|
|
Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
|
|
Licensed to the Free Software Foundation.
|
|
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
|
National Institute of Advanced Industrial Science and Technology (AIST)
|
|
Registration Number H13PRO009
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef EMACS_CHARACTER_H
|
|
#define EMACS_CHARACTER_H
|
|
|
|
/* character code 1st byte byte sequence
|
|
-------------- -------- -------------
|
|
0-7F 00..7F 0xxxxxxx
|
|
80-7FF C2..DF 110xxxxx 10xxxxxx
|
|
800-FFFF E0..EF 1110xxxx 10xxxxxx 10xxxxxx
|
|
10000-1FFFFF F0..F7 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
|
|
200000-3FFF7F F8 11111000 1000xxxx 10xxxxxx 10xxxxxx 10xxxxxx
|
|
3FFF80-3FFFFF C0..C1 1100000x 10xxxxxx (for eight-bit-char)
|
|
400000-... invalid
|
|
|
|
invalid 1st byte 80..BF 10xxxxxx
|
|
F9..FF 11111xxx (xxx != 000)
|
|
*/
|
|
|
|
/* Maximum character code ((1 << CHARACTERBITS) - 1). */
|
|
#define MAX_CHAR 0x3FFFFF
|
|
|
|
/* Maximum Unicode character code. */
|
|
#define MAX_UNICODE_CHAR 0x10FFFF
|
|
|
|
/* Maximum N-byte character codes. */
|
|
#define MAX_1_BYTE_CHAR 0x7F
|
|
#define MAX_2_BYTE_CHAR 0x7FF
|
|
#define MAX_3_BYTE_CHAR 0xFFFF
|
|
#define MAX_4_BYTE_CHAR 0x1FFFFF
|
|
#define MAX_5_BYTE_CHAR 0x3FFF7F
|
|
|
|
/* Minimum leading code of multibyte characters. */
|
|
#define MIN_MULTIBYTE_LEADING_CODE 0xC0
|
|
/* Maximum leading code of multibyte characters. */
|
|
#define MAX_MULTIBYTE_LEADING_CODE 0xF8
|
|
|
|
/* Nonzero iff C is a character that corresponds to a raw 8-bit
|
|
byte. */
|
|
#define CHAR_BYTE8_P(c) ((c) > MAX_5_BYTE_CHAR)
|
|
|
|
/* Return the character code for raw 8-bit byte BYTE. */
|
|
#define BYTE8_TO_CHAR(byte) ((byte) + 0x3FFF00)
|
|
|
|
#define UNIBYTE_TO_CHAR(byte) \
|
|
(ASCII_BYTE_P (byte) ? (byte) : BYTE8_TO_CHAR (byte))
|
|
|
|
/* Return the raw 8-bit byte for character C. */
|
|
#define CHAR_TO_BYTE8(c) \
|
|
(CHAR_BYTE8_P (c) \
|
|
? (c) - 0x3FFF00 \
|
|
: multibyte_char_to_unibyte (c, Qnil))
|
|
|
|
/* Return the raw 8-bit byte for character C,
|
|
or -1 if C doesn't correspond to a byte. */
|
|
#define CHAR_TO_BYTE_SAFE(c) \
|
|
(CHAR_BYTE8_P (c) \
|
|
? (c) - 0x3FFF00 \
|
|
: multibyte_char_to_unibyte_safe (c))
|
|
|
|
/* Nonzero iff BYTE is the 1st byte of a multibyte form of a character
|
|
that corresponds to a raw 8-bit byte. */
|
|
#define CHAR_BYTE8_HEAD_P(byte) ((byte) == 0xC0 || (byte) == 0xC1)
|
|
|
|
/* If C is not ASCII, make it unibyte. */
|
|
#define MAKE_CHAR_UNIBYTE(c) \
|
|
do { \
|
|
if (! ASCII_CHAR_P (c)) \
|
|
c = CHAR_TO_BYTE8 (c); \
|
|
} while (0)
|
|
|
|
|
|
/* If C is not ASCII, make it multibyte. Assumes C < 256. */
|
|
#define MAKE_CHAR_MULTIBYTE(c) \
|
|
(eassert ((c) >= 0 && (c) < 256), (c) = UNIBYTE_TO_CHAR (c))
|
|
|
|
/* This is the maximum byte length of multibyte form. */
|
|
#define MAX_MULTIBYTE_LENGTH 5
|
|
|
|
/* Return a Lisp character whose character code is C. Assumes C is
|
|
a valid character code. */
|
|
#define make_char(c) make_number (c)
|
|
|
|
/* Nonzero iff C is an ASCII byte. */
|
|
#define ASCII_BYTE_P(c) ((unsigned) (c) < 0x80)
|
|
|
|
/* Nonzero iff X is a character. */
|
|
#define CHARACTERP(x) (NATNUMP (x) && XFASTINT (x) <= MAX_CHAR)
|
|
|
|
/* Nonzero iff C is valid as a character code. GENERICP is not used. */
|
|
#define CHAR_VALID_P(c, genericp) ((unsigned) (c) <= MAX_CHAR)
|
|
|
|
/* Check if Lisp object X is a character or not. */
|
|
#define CHECK_CHARACTER(x) \
|
|
CHECK_TYPE (CHARACTERP (x), Qcharacterp, x)
|
|
|
|
#define CHECK_CHARACTER_CAR(x) \
|
|
do { \
|
|
Lisp_Object tmp = XCAR (x); \
|
|
CHECK_CHARACTER (tmp); \
|
|
XSETCAR ((x), tmp); \
|
|
} while (0)
|
|
|
|
#define CHECK_CHARACTER_CDR(x) \
|
|
do { \
|
|
Lisp_Object tmp = XCDR (x); \
|
|
CHECK_CHARACTER (tmp); \
|
|
XSETCDR ((x), tmp); \
|
|
} while (0)
|
|
|
|
/* Nonzero iff C is an ASCII character. */
|
|
#define ASCII_CHAR_P(c) ((unsigned) (c) < 0x80)
|
|
|
|
/* Nonzero iff C is a character of code less than 0x100. */
|
|
#define SINGLE_BYTE_CHAR_P(c) ((unsigned) (c) < 0x100)
|
|
|
|
/* Nonzero if character C has a printable glyph. */
|
|
#define CHAR_PRINTABLE_P(c) \
|
|
(((c) >= 32 && (c) < 127) \
|
|
|| ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c))))
|
|
|
|
/* Return byte length of multibyte form for character C. */
|
|
#define CHAR_BYTES(c) \
|
|
( (c) <= MAX_1_BYTE_CHAR ? 1 \
|
|
: (c) <= MAX_2_BYTE_CHAR ? 2 \
|
|
: (c) <= MAX_3_BYTE_CHAR ? 3 \
|
|
: (c) <= MAX_4_BYTE_CHAR ? 4 \
|
|
: (c) <= MAX_5_BYTE_CHAR ? 5 \
|
|
: 2)
|
|
|
|
|
|
/* Return the leading code of multibyte form of C. */
|
|
#define CHAR_LEADING_CODE(c) \
|
|
((c) <= MAX_1_BYTE_CHAR ? c \
|
|
: (c) <= MAX_2_BYTE_CHAR ? (0xC0 | ((c) >> 6)) \
|
|
: (c) <= MAX_3_BYTE_CHAR ? (0xE0 | ((c) >> 12)) \
|
|
: (c) <= MAX_4_BYTE_CHAR ? (0xF0 | ((c) >> 18)) \
|
|
: (c) <= MAX_5_BYTE_CHAR ? 0xF8 \
|
|
: (0xC0 | (((c) >> 6) & 0x01)))
|
|
|
|
|
|
/* Store multibyte form of the character C in P. The caller should
|
|
allocate at least MAX_MULTIBYTE_LENGTH bytes area at P in advance.
|
|
Returns the length of the multibyte form. */
|
|
|
|
#define CHAR_STRING(c, p) \
|
|
((unsigned) (c) <= MAX_1_BYTE_CHAR \
|
|
? ((p)[0] = (c), \
|
|
1) \
|
|
: (unsigned) (c) <= MAX_2_BYTE_CHAR \
|
|
? ((p)[0] = (0xC0 | ((c) >> 6)), \
|
|
(p)[1] = (0x80 | ((c) & 0x3F)), \
|
|
2) \
|
|
: (unsigned) (c) <= MAX_3_BYTE_CHAR \
|
|
? ((p)[0] = (0xE0 | ((c) >> 12)), \
|
|
(p)[1] = (0x80 | (((c) >> 6) & 0x3F)), \
|
|
(p)[2] = (0x80 | ((c) & 0x3F)), \
|
|
3) \
|
|
: char_string ((unsigned) c, p))
|
|
|
|
/* Store multibyte form of byte B in P. The caller should allocate at
|
|
least MAX_MULTIBYTE_LENGTH bytes area at P in advance. Returns the
|
|
length of the multibyte form. */
|
|
|
|
#define BYTE8_STRING(b, p) \
|
|
((p)[0] = (0xC0 | (((b) >> 6) & 0x01)), \
|
|
(p)[1] = (0x80 | ((b) & 0x3F)), \
|
|
2)
|
|
|
|
|
|
/* Store multibyte form of the character C in P and advance P to the
|
|
end of the multibyte form. The caller should allocate at least
|
|
MAX_MULTIBYTE_LENGTH bytes area at P in advance. */
|
|
|
|
#define CHAR_STRING_ADVANCE(c, p) \
|
|
do { \
|
|
if ((c) <= MAX_1_BYTE_CHAR) \
|
|
*(p)++ = (c); \
|
|
else if ((c) <= MAX_2_BYTE_CHAR) \
|
|
*(p)++ = (0xC0 | ((c) >> 6)), \
|
|
*(p)++ = (0x80 | ((c) & 0x3F)); \
|
|
else if ((c) <= MAX_3_BYTE_CHAR) \
|
|
*(p)++ = (0xE0 | ((c) >> 12)), \
|
|
*(p)++ = (0x80 | (((c) >> 6) & 0x3F)), \
|
|
*(p)++ = (0x80 | ((c) & 0x3F)); \
|
|
else \
|
|
(p) += char_string ((c), (p)); \
|
|
} while (0)
|
|
|
|
|
|
/* Nonzero iff BYTE starts a non-ASCII character in a multibyte
|
|
form. */
|
|
#define LEADING_CODE_P(byte) (((byte) & 0xC0) == 0xC0)
|
|
|
|
/* Nonzero iff BYTE is a trailing code of a non-ASCII character in a
|
|
multibyte form. */
|
|
#define TRAILING_CODE_P(byte) (((byte) & 0xC0) == 0x80)
|
|
|
|
/* Nonzero iff BYTE starts a character in a multibyte form.
|
|
This is equivalent to:
|
|
(ASCII_BYTE_P (byte) || LEADING_CODE_P (byte)) */
|
|
#define CHAR_HEAD_P(byte) (((byte) & 0xC0) != 0x80)
|
|
|
|
/* How many bytes a character that starts with BYTE occupies in a
|
|
multibyte form. */
|
|
#define BYTES_BY_CHAR_HEAD(byte) \
|
|
(!((byte) & 0x80) ? 1 \
|
|
: !((byte) & 0x20) ? 2 \
|
|
: !((byte) & 0x10) ? 3 \
|
|
: !((byte) & 0x08) ? 4 \
|
|
: 5)
|
|
|
|
|
|
/* The byte length of multibyte form at unibyte string P ending at
|
|
PEND. If STR doesn't point to a valid multibyte form, return 0. */
|
|
|
|
#define MULTIBYTE_LENGTH(p, pend) \
|
|
(p >= pend ? 0 \
|
|
: !((p)[0] & 0x80) ? 1 \
|
|
: ((p + 1 >= pend) || (((p)[1] & 0xC0) != 0x80)) ? 0 \
|
|
: ((p)[0] & 0xE0) == 0xC0 ? 2 \
|
|
: ((p + 2 >= pend) || (((p)[2] & 0xC0) != 0x80)) ? 0 \
|
|
: ((p)[0] & 0xF0) == 0xE0 ? 3 \
|
|
: ((p + 3 >= pend) || (((p)[3] & 0xC0) != 0x80)) ? 0 \
|
|
: ((p)[0] & 0xF8) == 0xF0 ? 4 \
|
|
: ((p + 4 >= pend) || (((p)[4] & 0xC0) != 0x80)) ? 0 \
|
|
: (p)[0] == 0xF8 && ((p)[1] & 0xF0) == 0x80 ? 5 \
|
|
: 0)
|
|
|
|
|
|
/* Like MULTIBYTE_LENGTH, but don't check the ending address. */
|
|
|
|
#define MULTIBYTE_LENGTH_NO_CHECK(p) \
|
|
(!((p)[0] & 0x80) ? 1 \
|
|
: ((p)[1] & 0xC0) != 0x80 ? 0 \
|
|
: ((p)[0] & 0xE0) == 0xC0 ? 2 \
|
|
: ((p)[2] & 0xC0) != 0x80 ? 0 \
|
|
: ((p)[0] & 0xF0) == 0xE0 ? 3 \
|
|
: ((p)[3] & 0xC0) != 0x80 ? 0 \
|
|
: ((p)[0] & 0xF8) == 0xF0 ? 4 \
|
|
: ((p)[4] & 0xC0) != 0x80 ? 0 \
|
|
: (p)[0] == 0xF8 && ((p)[1] & 0xF0) == 0x80 ? 5 \
|
|
: 0)
|
|
|
|
/* If P is before LIMIT, advance P to the next character boundary.
|
|
Assumes that P is already at a character boundary of the same
|
|
multibyte form whose end address is LIMIT. */
|
|
|
|
#define NEXT_CHAR_BOUNDARY(p, limit) \
|
|
do { \
|
|
if ((p) < (limit)) \
|
|
(p) += BYTES_BY_CHAR_HEAD (*(p)); \
|
|
} while (0)
|
|
|
|
|
|
/* If P is after LIMIT, advance P to the previous character boundary.
|
|
Assumes that P is already at a character boundary of the same
|
|
multibyte form whose beginning address is LIMIT. */
|
|
|
|
#define PREV_CHAR_BOUNDARY(p, limit) \
|
|
do { \
|
|
if ((p) > (limit)) \
|
|
{ \
|
|
const unsigned char *p0 = (p); \
|
|
do { \
|
|
p0--; \
|
|
} while (p0 >= limit && ! CHAR_HEAD_P (*p0)); \
|
|
(p) = (BYTES_BY_CHAR_HEAD (*p0) == (p) - p0) ? p0 : (p) - 1; \
|
|
} \
|
|
} while (0)
|
|
|
|
/* Return the character code of character whose multibyte form is at
|
|
P. */
|
|
|
|
#define STRING_CHAR(p) \
|
|
(!((p)[0] & 0x80) \
|
|
? (p)[0] \
|
|
: ! ((p)[0] & 0x20) \
|
|
? (((((p)[0] & 0x1F) << 6) \
|
|
| ((p)[1] & 0x3F)) \
|
|
+ (((unsigned char) (p)[0]) < 0xC2 ? 0x3FFF80 : 0)) \
|
|
: ! ((p)[0] & 0x10) \
|
|
? ((((p)[0] & 0x0F) << 12) \
|
|
| (((p)[1] & 0x3F) << 6) \
|
|
| ((p)[2] & 0x3F)) \
|
|
: string_char ((p), NULL, NULL))
|
|
|
|
|
|
/* Like STRING_CHAR, but set ACTUAL_LEN to the length of multibyte
|
|
form. */
|
|
|
|
#define STRING_CHAR_AND_LENGTH(p, actual_len) \
|
|
(!((p)[0] & 0x80) \
|
|
? ((actual_len) = 1, (p)[0]) \
|
|
: ! ((p)[0] & 0x20) \
|
|
? ((actual_len) = 2, \
|
|
(((((p)[0] & 0x1F) << 6) \
|
|
| ((p)[1] & 0x3F)) \
|
|
+ (((unsigned char) (p)[0]) < 0xC2 ? 0x3FFF80 : 0))) \
|
|
: ! ((p)[0] & 0x10) \
|
|
? ((actual_len) = 3, \
|
|
((((p)[0] & 0x0F) << 12) \
|
|
| (((p)[1] & 0x3F) << 6) \
|
|
| ((p)[2] & 0x3F))) \
|
|
: string_char ((p), NULL, &actual_len))
|
|
|
|
|
|
/* Like STRING_CHAR, but advance P to the end of multibyte form. */
|
|
|
|
#define STRING_CHAR_ADVANCE(p) \
|
|
(!((p)[0] & 0x80) \
|
|
? *(p)++ \
|
|
: ! ((p)[0] & 0x20) \
|
|
? ((p) += 2, \
|
|
((((p)[-2] & 0x1F) << 6) \
|
|
| ((p)[-1] & 0x3F) \
|
|
| ((unsigned char) ((p)[-2]) < 0xC2 ? 0x3FFF80 : 0))) \
|
|
: ! ((p)[0] & 0x10) \
|
|
? ((p) += 3, \
|
|
((((p)[-3] & 0x0F) << 12) \
|
|
| (((p)[-2] & 0x3F) << 6) \
|
|
| ((p)[-1] & 0x3F))) \
|
|
: string_char ((p), &(p), NULL))
|
|
|
|
|
|
/* Fetch the "next" character from Lisp string STRING at byte position
|
|
BYTEIDX, character position CHARIDX. Store it into OUTPUT.
|
|
|
|
All the args must be side-effect-free.
|
|
BYTEIDX and CHARIDX must be lvalues;
|
|
we increment them past the character fetched. */
|
|
|
|
#define FETCH_STRING_CHAR_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX) \
|
|
do \
|
|
{ \
|
|
CHARIDX++; \
|
|
if (STRING_MULTIBYTE (STRING)) \
|
|
{ \
|
|
unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \
|
|
int len; \
|
|
\
|
|
OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \
|
|
BYTEIDX += len; \
|
|
} \
|
|
else \
|
|
{ \
|
|
OUTPUT = SREF (STRING, BYTEIDX); \
|
|
BYTEIDX++; \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
/* Like FETCH_STRING_CHAR_ADVANCE, but return a multibyte character
|
|
even if STRING is unibyte. */
|
|
|
|
#define FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX) \
|
|
do \
|
|
{ \
|
|
CHARIDX++; \
|
|
if (STRING_MULTIBYTE (STRING)) \
|
|
{ \
|
|
unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \
|
|
int len; \
|
|
\
|
|
OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \
|
|
BYTEIDX += len; \
|
|
} \
|
|
else \
|
|
{ \
|
|
OUTPUT = SREF (STRING, BYTEIDX); \
|
|
BYTEIDX++; \
|
|
MAKE_CHAR_MULTIBYTE (OUTPUT); \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
/* Like FETCH_STRING_CHAR_ADVANCE, but assumes STRING is multibyte. */
|
|
|
|
#define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \
|
|
do \
|
|
{ \
|
|
unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \
|
|
int len; \
|
|
\
|
|
OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \
|
|
BYTEIDX += len; \
|
|
CHARIDX++; \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
/* Like FETCH_STRING_CHAR_ADVANCE, but fetch character from the current
|
|
buffer. */
|
|
|
|
#define FETCH_CHAR_ADVANCE(OUTPUT, CHARIDX, BYTEIDX) \
|
|
do \
|
|
{ \
|
|
CHARIDX++; \
|
|
if (!NILP (current_buffer->enable_multibyte_characters)) \
|
|
{ \
|
|
unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \
|
|
int len; \
|
|
\
|
|
OUTPUT= STRING_CHAR_AND_LENGTH (ptr, len); \
|
|
BYTEIDX += len; \
|
|
} \
|
|
else \
|
|
{ \
|
|
OUTPUT = *(BYTE_POS_ADDR (BYTEIDX)); \
|
|
BYTEIDX++; \
|
|
} \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
/* Like FETCH_CHAR_ADVANCE, but assumes the current buffer is multibyte. */
|
|
|
|
#define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX) \
|
|
do \
|
|
{ \
|
|
unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX); \
|
|
int len; \
|
|
\
|
|
OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \
|
|
BYTEIDX += len; \
|
|
CHARIDX++; \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
/* Increment the buffer byte position POS_BYTE of the current buffer to
|
|
the next character boundary. No range checking of POS. */
|
|
|
|
#define INC_POS(pos_byte) \
|
|
do { \
|
|
unsigned char *p = BYTE_POS_ADDR (pos_byte); \
|
|
pos_byte += BYTES_BY_CHAR_HEAD (*p); \
|
|
} while (0)
|
|
|
|
|
|
/* Decrement the buffer byte position POS_BYTE of the current buffer to
|
|
the previous character boundary. No range checking of POS. */
|
|
|
|
#define DEC_POS(pos_byte) \
|
|
do { \
|
|
unsigned char *p; \
|
|
\
|
|
pos_byte--; \
|
|
if (pos_byte < GPT_BYTE) \
|
|
p = BEG_ADDR + pos_byte - BEG_BYTE; \
|
|
else \
|
|
p = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE;\
|
|
while (!CHAR_HEAD_P (*p)) \
|
|
{ \
|
|
p--; \
|
|
pos_byte--; \
|
|
} \
|
|
} while (0)
|
|
|
|
/* Increment both CHARPOS and BYTEPOS, each in the appropriate way. */
|
|
|
|
#define INC_BOTH(charpos, bytepos) \
|
|
do \
|
|
{ \
|
|
(charpos)++; \
|
|
if (NILP (current_buffer->enable_multibyte_characters)) \
|
|
(bytepos)++; \
|
|
else \
|
|
INC_POS ((bytepos)); \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
/* Decrement both CHARPOS and BYTEPOS, each in the appropriate way. */
|
|
|
|
#define DEC_BOTH(charpos, bytepos) \
|
|
do \
|
|
{ \
|
|
(charpos)--; \
|
|
if (NILP (current_buffer->enable_multibyte_characters)) \
|
|
(bytepos)--; \
|
|
else \
|
|
DEC_POS ((bytepos)); \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
/* Increment the buffer byte position POS_BYTE of the current buffer to
|
|
the next character boundary. This macro relies on the fact that
|
|
*GPT_ADDR and *Z_ADDR are always accessible and the values are
|
|
'\0'. No range checking of POS_BYTE. */
|
|
|
|
#define BUF_INC_POS(buf, pos_byte) \
|
|
do { \
|
|
unsigned char *p = BUF_BYTE_ADDRESS (buf, pos_byte); \
|
|
pos_byte += BYTES_BY_CHAR_HEAD (*p); \
|
|
} while (0)
|
|
|
|
|
|
/* Decrement the buffer byte position POS_BYTE of the current buffer to
|
|
the previous character boundary. No range checking of POS_BYTE. */
|
|
|
|
#define BUF_DEC_POS(buf, pos_byte) \
|
|
do { \
|
|
unsigned char *p; \
|
|
pos_byte--; \
|
|
if (pos_byte < BUF_GPT_BYTE (buf)) \
|
|
p = BUF_BEG_ADDR (buf) + pos_byte - BEG_BYTE; \
|
|
else \
|
|
p = BUF_BEG_ADDR (buf) + BUF_GAP_SIZE (buf) + pos_byte - BEG_BYTE;\
|
|
while (!CHAR_HEAD_P (*p)) \
|
|
{ \
|
|
p--; \
|
|
pos_byte--; \
|
|
} \
|
|
} while (0)
|
|
|
|
|
|
/* If C is a character to be unified with a Unicode character, return
|
|
the unified Unicode character. */
|
|
|
|
#define MAYBE_UNIFY_CHAR(c) \
|
|
do { \
|
|
if (c > MAX_UNICODE_CHAR && c <= MAX_5_BYTE_CHAR) \
|
|
{ \
|
|
Lisp_Object val; \
|
|
val = CHAR_TABLE_REF (Vchar_unify_table, c); \
|
|
if (INTEGERP (val)) \
|
|
c = XINT (val); \
|
|
else if (! NILP (val)) \
|
|
c = maybe_unify_char (c, val); \
|
|
} \
|
|
} while (0)
|
|
|
|
|
|
/* Return the width of ASCII character C. The width is measured by
|
|
how many columns C will occupy on the screen when displayed in the
|
|
current buffer. */
|
|
|
|
#define ASCII_CHAR_WIDTH(c) \
|
|
(c < 0x20 \
|
|
? (c == '\t' \
|
|
? XFASTINT (current_buffer->tab_width) \
|
|
: (c == '\n' ? 0 : (NILP (current_buffer->ctl_arrow) ? 4 : 2))) \
|
|
: (c < 0x7f \
|
|
? 1 \
|
|
: ((NILP (current_buffer->ctl_arrow) ? 4 : 2))))
|
|
|
|
/* Return the width of character C. The width is measured by how many
|
|
columns C will occupy on the screen when displayed in the current
|
|
buffer. */
|
|
|
|
#define CHAR_WIDTH(c) \
|
|
(ASCII_CHAR_P (c) \
|
|
? ASCII_CHAR_WIDTH (c) \
|
|
: XINT (CHAR_TABLE_REF (Vchar_width_table, c)))
|
|
|
|
/* If C is a variation selector, return the index numnber of the
|
|
variation selector (1..256). Otherwise, return 0. */
|
|
|
|
#define CHAR_VARIATION_SELECTOR_P(c) \
|
|
((c) < 0xFE00 ? 0 \
|
|
: (c) <= 0xFE0F ? (c) - 0xFE00 + 1 \
|
|
: (c) < 0xE0100 ? 0 \
|
|
: (c) <= 0xE01EF ? (c) - 0xE0100 + 17 \
|
|
: 0)
|
|
|
|
/* If C is a high surrogate, return 1. If C is a low surrogate,
|
|
return 0. Otherwise, return 0. */
|
|
|
|
#define CHAR_SURROGATE_PAIR_P(c) \
|
|
((c) < 0xD800 ? 0 \
|
|
: (c) <= 0xDBFF ? 1 \
|
|
: (c) <= 0xDFFF ? 2 \
|
|
: 0)
|
|
|
|
|
|
extern int char_resolve_modifier_mask (int);
|
|
extern int char_string (unsigned, unsigned char *);
|
|
extern int string_char (const unsigned char *,
|
|
const unsigned char **, int *);
|
|
|
|
extern int translate_char (Lisp_Object, int c);
|
|
extern int char_printable_p (int c);
|
|
extern void parse_str_as_multibyte (const unsigned char *,
|
|
EMACS_INT, EMACS_INT *, EMACS_INT *);
|
|
extern EMACS_INT parse_str_to_multibyte (const unsigned char *, EMACS_INT);
|
|
extern EMACS_INT str_as_multibyte (unsigned char *, EMACS_INT, EMACS_INT,
|
|
EMACS_INT *);
|
|
extern EMACS_INT str_to_multibyte (unsigned char *, EMACS_INT, EMACS_INT);
|
|
extern EMACS_INT str_as_unibyte (unsigned char *, EMACS_INT);
|
|
extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *,
|
|
EMACS_INT, int);
|
|
extern EMACS_INT strwidth (const unsigned char *, EMACS_INT);
|
|
extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int,
|
|
EMACS_INT *, EMACS_INT *);
|
|
extern EMACS_INT lisp_string_width (Lisp_Object, int,
|
|
EMACS_INT *, EMACS_INT *);
|
|
|
|
extern Lisp_Object Qcharacterp, Qauto_fill_chars;
|
|
extern Lisp_Object Vchar_unify_table;
|
|
extern Lisp_Object string_escape_byte8 (Lisp_Object);
|
|
|
|
/* Return a translation table of id number ID. */
|
|
#define GET_TRANSLATION_TABLE(id) \
|
|
(XCDR(XVECTOR(Vtranslation_table_vector)->contents[(id)]))
|
|
|
|
#define DEFSYM(sym, name) \
|
|
do { (sym) = intern_c_string ((name)); staticpro (&(sym)); } while (0)
|
|
|
|
#endif /* EMACS_CHARACTER_H */
|
|
|