mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-06-16 21:41:27 +00: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.
1117 lines
28 KiB
C
1117 lines
28 KiB
C
/* Basic character support.
|
||
Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN.
|
||
Licensed to the Free Software Foundation.
|
||
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||
Free Software Foundation, Inc.
|
||
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/>. */
|
||
|
||
/* At first, see the document in `character.h' to understand the code
|
||
in this file. */
|
||
|
||
#ifdef emacs
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <stdio.h>
|
||
|
||
#ifdef emacs
|
||
|
||
#include <sys/types.h>
|
||
#include <setjmp.h>
|
||
#include "lisp.h"
|
||
#include "character.h"
|
||
#include "buffer.h"
|
||
#include "charset.h"
|
||
#include "composite.h"
|
||
#include "disptab.h"
|
||
|
||
#else /* not emacs */
|
||
|
||
#include "mulelib.h"
|
||
|
||
#endif /* emacs */
|
||
|
||
Lisp_Object Qcharacterp;
|
||
|
||
Lisp_Object Qauto_fill_chars;
|
||
|
||
/* Char-table of information about which character to unify to which
|
||
Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */
|
||
Lisp_Object Vchar_unify_table;
|
||
|
||
/* Variable used locally in the macro FETCH_MULTIBYTE_CHAR. */
|
||
unsigned char *_fetch_multibyte_char_p;
|
||
|
||
static Lisp_Object Qchar_script_table;
|
||
|
||
|
||
|
||
/* If character code C has modifier masks, reflect them to the
|
||
character code if possible. Return the resulting code. */
|
||
|
||
int
|
||
char_resolve_modifier_mask (int c)
|
||
{
|
||
/* A non-ASCII character can't reflect modifier bits to the code. */
|
||
if (! ASCII_CHAR_P ((c & ~CHAR_MODIFIER_MASK)))
|
||
return c;
|
||
|
||
/* For Meta, Shift, and Control modifiers, we need special care. */
|
||
if (c & CHAR_SHIFT)
|
||
{
|
||
/* Shift modifier is valid only with [A-Za-z]. */
|
||
if ((c & 0377) >= 'A' && (c & 0377) <= 'Z')
|
||
c &= ~CHAR_SHIFT;
|
||
else if ((c & 0377) >= 'a' && (c & 0377) <= 'z')
|
||
c = (c & ~CHAR_SHIFT) - ('a' - 'A');
|
||
/* Shift modifier for control characters and SPC is ignored. */
|
||
else if ((c & ~CHAR_MODIFIER_MASK) <= 0x20)
|
||
c &= ~CHAR_SHIFT;
|
||
}
|
||
if (c & CHAR_CTL)
|
||
{
|
||
/* Simulate the code in lread.c. */
|
||
/* Allow `\C- ' and `\C-?'. */
|
||
if ((c & 0377) == ' ')
|
||
c &= ~0177 & ~ CHAR_CTL;
|
||
else if ((c & 0377) == '?')
|
||
c = 0177 | (c & ~0177 & ~CHAR_CTL);
|
||
/* ASCII control chars are made from letters (both cases),
|
||
as well as the non-letters within 0100...0137. */
|
||
else if ((c & 0137) >= 0101 && (c & 0137) <= 0132)
|
||
c &= (037 | (~0177 & ~CHAR_CTL));
|
||
else if ((c & 0177) >= 0100 && (c & 0177) <= 0137)
|
||
c &= (037 | (~0177 & ~CHAR_CTL));
|
||
}
|
||
#if 0 /* This is outside the scope of this function. (bug#4751) */
|
||
if (c & CHAR_META)
|
||
{
|
||
/* Move the meta bit to the right place for a string. */
|
||
c = (c & ~CHAR_META) | 0x80;
|
||
}
|
||
#endif
|
||
|
||
return c;
|
||
}
|
||
|
||
|
||
/* Store multibyte form of character C at P. If C has modifier bits,
|
||
handle them appropriately. */
|
||
|
||
int
|
||
char_string (unsigned int c, unsigned char *p)
|
||
{
|
||
int bytes;
|
||
|
||
if (c & CHAR_MODIFIER_MASK)
|
||
{
|
||
c = (unsigned) char_resolve_modifier_mask ((int) c);
|
||
/* If C still has any modifier bits, just ignore it. */
|
||
c &= ~CHAR_MODIFIER_MASK;
|
||
}
|
||
|
||
MAYBE_UNIFY_CHAR (c);
|
||
|
||
if (c <= MAX_3_BYTE_CHAR)
|
||
{
|
||
bytes = CHAR_STRING (c, p);
|
||
}
|
||
else if (c <= MAX_4_BYTE_CHAR)
|
||
{
|
||
p[0] = (0xF0 | (c >> 18));
|
||
p[1] = (0x80 | ((c >> 12) & 0x3F));
|
||
p[2] = (0x80 | ((c >> 6) & 0x3F));
|
||
p[3] = (0x80 | (c & 0x3F));
|
||
bytes = 4;
|
||
}
|
||
else if (c <= MAX_5_BYTE_CHAR)
|
||
{
|
||
p[0] = 0xF8;
|
||
p[1] = (0x80 | ((c >> 18) & 0x0F));
|
||
p[2] = (0x80 | ((c >> 12) & 0x3F));
|
||
p[3] = (0x80 | ((c >> 6) & 0x3F));
|
||
p[4] = (0x80 | (c & 0x3F));
|
||
bytes = 5;
|
||
}
|
||
else if (c <= MAX_CHAR)
|
||
{
|
||
c = CHAR_TO_BYTE8 (c);
|
||
bytes = BYTE8_STRING (c, p);
|
||
}
|
||
else
|
||
error ("Invalid character: %d", c);
|
||
|
||
return bytes;
|
||
}
|
||
|
||
|
||
/* Return a character whose multibyte form is at P. Set LEN is not
|
||
NULL, it must be a pointer to integer. In that case, set *LEN to
|
||
the byte length of the multibyte form. If ADVANCED is not NULL, is
|
||
must be a pointer to unsigned char. In that case, set *ADVANCED to
|
||
the ending address (i.e. the starting address of the next
|
||
character) of the multibyte form. */
|
||
|
||
int
|
||
string_char (const unsigned char *p, const unsigned char **advanced, int *len)
|
||
{
|
||
int c;
|
||
const unsigned char *saved_p = p;
|
||
|
||
if (*p < 0x80 || ! (*p & 0x20) || ! (*p & 0x10))
|
||
{
|
||
c = STRING_CHAR_ADVANCE (p);
|
||
}
|
||
else if (! (*p & 0x08))
|
||
{
|
||
c = ((((p)[0] & 0xF) << 18)
|
||
| (((p)[1] & 0x3F) << 12)
|
||
| (((p)[2] & 0x3F) << 6)
|
||
| ((p)[3] & 0x3F));
|
||
p += 4;
|
||
}
|
||
else
|
||
{
|
||
c = ((((p)[1] & 0x3F) << 18)
|
||
| (((p)[2] & 0x3F) << 12)
|
||
| (((p)[3] & 0x3F) << 6)
|
||
| ((p)[4] & 0x3F));
|
||
p += 5;
|
||
}
|
||
|
||
MAYBE_UNIFY_CHAR (c);
|
||
|
||
if (len)
|
||
*len = p - saved_p;
|
||
if (advanced)
|
||
*advanced = p;
|
||
return c;
|
||
}
|
||
|
||
|
||
/* Translate character C by translation table TABLE. If C is
|
||
negative, translate a character specified by CHARSET and CODE. If
|
||
no translation is found in TABLE, return the untranslated
|
||
character. If TABLE is a list, elements are char tables. In this
|
||
case, translace C by all tables. */
|
||
|
||
int
|
||
translate_char (Lisp_Object table, int c)
|
||
{
|
||
if (CHAR_TABLE_P (table))
|
||
{
|
||
Lisp_Object ch;
|
||
|
||
ch = CHAR_TABLE_REF (table, c);
|
||
if (CHARACTERP (ch))
|
||
c = XINT (ch);
|
||
}
|
||
else
|
||
{
|
||
for (; CONSP (table); table = XCDR (table))
|
||
c = translate_char (XCAR (table), c);
|
||
}
|
||
return c;
|
||
}
|
||
|
||
/* Convert ASCII or 8-bit character C to unibyte. If C is none of
|
||
them, return (C & 0xFF).
|
||
|
||
The argument REV_TBL is now ignored. It will be removed in the
|
||
future. */
|
||
|
||
int
|
||
multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl)
|
||
{
|
||
if (c < 0x80)
|
||
return c;
|
||
if (CHAR_BYTE8_P (c))
|
||
return CHAR_TO_BYTE8 (c);
|
||
return (c & 0xFF);
|
||
}
|
||
|
||
/* Like multibyte_char_to_unibyte, but return -1 if C is not supported
|
||
by charset_unibyte. */
|
||
|
||
int
|
||
multibyte_char_to_unibyte_safe (int c)
|
||
{
|
||
if (c < 0x80)
|
||
return c;
|
||
if (CHAR_BYTE8_P (c))
|
||
return CHAR_TO_BYTE8 (c);
|
||
return -1;
|
||
}
|
||
|
||
DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0,
|
||
doc: /* Return non-nil if OBJECT is a character. */)
|
||
(Lisp_Object object, Lisp_Object ignore)
|
||
{
|
||
return (CHARACTERP (object) ? Qt : Qnil);
|
||
}
|
||
|
||
DEFUN ("max-char", Fmax_char, Smax_char, 0, 0, 0,
|
||
doc: /* Return the character of the maximum code. */)
|
||
(void)
|
||
{
|
||
return make_number (MAX_CHAR);
|
||
}
|
||
|
||
DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte,
|
||
Sunibyte_char_to_multibyte, 1, 1, 0,
|
||
doc: /* Convert the byte CH to multibyte character. */)
|
||
(Lisp_Object ch)
|
||
{
|
||
int c;
|
||
|
||
CHECK_CHARACTER (ch);
|
||
c = XFASTINT (ch);
|
||
if (c >= 0x100)
|
||
error ("Not a unibyte character: %d", c);
|
||
MAKE_CHAR_MULTIBYTE (c);
|
||
return make_number (c);
|
||
}
|
||
|
||
DEFUN ("multibyte-char-to-unibyte", Fmultibyte_char_to_unibyte,
|
||
Smultibyte_char_to_unibyte, 1, 1, 0,
|
||
doc: /* Convert the multibyte character CH to a byte.
|
||
If the multibyte character does not represent a byte, return -1. */)
|
||
(Lisp_Object ch)
|
||
{
|
||
int cm;
|
||
|
||
CHECK_CHARACTER (ch);
|
||
cm = XFASTINT (ch);
|
||
if (cm < 256)
|
||
/* Can't distinguish a byte read from a unibyte buffer from
|
||
a latin1 char, so let's let it slide. */
|
||
return ch;
|
||
else
|
||
{
|
||
int cu = CHAR_TO_BYTE_SAFE (cm);
|
||
return make_number (cu);
|
||
}
|
||
}
|
||
|
||
DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0,
|
||
doc: /* Return width of CHAR when displayed in the current buffer.
|
||
The width is measured by how many columns it occupies on the screen.
|
||
Tab is taken to occupy `tab-width' columns.
|
||
usage: (char-width CHAR) */)
|
||
(Lisp_Object ch)
|
||
{
|
||
Lisp_Object disp;
|
||
int c, width;
|
||
struct Lisp_Char_Table *dp = buffer_display_table ();
|
||
|
||
CHECK_CHARACTER (ch);
|
||
c = XINT (ch);
|
||
|
||
/* Get the way the display table would display it. */
|
||
disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil;
|
||
|
||
if (VECTORP (disp))
|
||
width = ASIZE (disp);
|
||
else
|
||
width = CHAR_WIDTH (c);
|
||
|
||
return make_number (width);
|
||
}
|
||
|
||
/* Return width of string STR of length LEN when displayed in the
|
||
current buffer. The width is measured by how many columns it
|
||
occupies on the screen. If PRECISION > 0, return the width of
|
||
longest substring that doesn't exceed PRECISION, and set number of
|
||
characters and bytes of the substring in *NCHARS and *NBYTES
|
||
respectively. */
|
||
|
||
EMACS_INT
|
||
c_string_width (const unsigned char *str, EMACS_INT len, int precision,
|
||
EMACS_INT *nchars, EMACS_INT *nbytes)
|
||
{
|
||
EMACS_INT i = 0, i_byte = 0;
|
||
EMACS_INT width = 0;
|
||
struct Lisp_Char_Table *dp = buffer_display_table ();
|
||
|
||
while (i_byte < len)
|
||
{
|
||
int bytes, thiswidth;
|
||
Lisp_Object val;
|
||
int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
|
||
|
||
if (dp)
|
||
{
|
||
val = DISP_CHAR_VECTOR (dp, c);
|
||
if (VECTORP (val))
|
||
thiswidth = XVECTOR (val)->size;
|
||
else
|
||
thiswidth = CHAR_WIDTH (c);
|
||
}
|
||
else
|
||
{
|
||
thiswidth = CHAR_WIDTH (c);
|
||
}
|
||
|
||
if (precision > 0
|
||
&& (width + thiswidth > precision))
|
||
{
|
||
*nchars = i;
|
||
*nbytes = i_byte;
|
||
return width;
|
||
}
|
||
i++;
|
||
i_byte += bytes;
|
||
width += thiswidth;
|
||
}
|
||
|
||
if (precision > 0)
|
||
{
|
||
*nchars = i;
|
||
*nbytes = i_byte;
|
||
}
|
||
|
||
return width;
|
||
}
|
||
|
||
/* Return width of string STR of length LEN when displayed in the
|
||
current buffer. The width is measured by how many columns it
|
||
occupies on the screen. */
|
||
|
||
EMACS_INT
|
||
strwidth (const unsigned char *str, EMACS_INT len)
|
||
{
|
||
return c_string_width (str, len, -1, NULL, NULL);
|
||
}
|
||
|
||
/* Return width of Lisp string STRING when displayed in the current
|
||
buffer. The width is measured by how many columns it occupies on
|
||
the screen while paying attention to compositions. If PRECISION >
|
||
0, return the width of longest substring that doesn't exceed
|
||
PRECISION, and set number of characters and bytes of the substring
|
||
in *NCHARS and *NBYTES respectively. */
|
||
|
||
EMACS_INT
|
||
lisp_string_width (Lisp_Object string, int precision,
|
||
EMACS_INT *nchars, EMACS_INT *nbytes)
|
||
{
|
||
EMACS_INT len = SCHARS (string);
|
||
/* This set multibyte to 0 even if STRING is multibyte when it
|
||
contains only ascii and eight-bit-graphic, but that's
|
||
intentional. */
|
||
int multibyte = len < SBYTES (string);
|
||
unsigned char *str = SDATA (string);
|
||
EMACS_INT i = 0, i_byte = 0;
|
||
EMACS_INT width = 0;
|
||
struct Lisp_Char_Table *dp = buffer_display_table ();
|
||
|
||
while (i < len)
|
||
{
|
||
int chars, bytes, thiswidth;
|
||
Lisp_Object val;
|
||
int cmp_id;
|
||
EMACS_INT ignore, end;
|
||
|
||
if (find_composition (i, -1, &ignore, &end, &val, string)
|
||
&& ((cmp_id = get_composition_id (i, i_byte, end - i, val, string))
|
||
>= 0))
|
||
{
|
||
thiswidth = composition_table[cmp_id]->width;
|
||
chars = end - i;
|
||
bytes = string_char_to_byte (string, end) - i_byte;
|
||
}
|
||
else
|
||
{
|
||
int c;
|
||
|
||
if (multibyte)
|
||
c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
|
||
else
|
||
c = str[i_byte], bytes = 1;
|
||
chars = 1;
|
||
if (dp)
|
||
{
|
||
val = DISP_CHAR_VECTOR (dp, c);
|
||
if (VECTORP (val))
|
||
thiswidth = XVECTOR (val)->size;
|
||
else
|
||
thiswidth = CHAR_WIDTH (c);
|
||
}
|
||
else
|
||
{
|
||
thiswidth = CHAR_WIDTH (c);
|
||
}
|
||
}
|
||
|
||
if (precision > 0
|
||
&& (width + thiswidth > precision))
|
||
{
|
||
*nchars = i;
|
||
*nbytes = i_byte;
|
||
return width;
|
||
}
|
||
i += chars;
|
||
i_byte += bytes;
|
||
width += thiswidth;
|
||
}
|
||
|
||
if (precision > 0)
|
||
{
|
||
*nchars = i;
|
||
*nbytes = i_byte;
|
||
}
|
||
|
||
return width;
|
||
}
|
||
|
||
DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0,
|
||
doc: /* Return width of STRING when displayed in the current buffer.
|
||
Width is measured by how many columns it occupies on the screen.
|
||
When calculating width of a multibyte character in STRING,
|
||
only the base leading-code is considered; the validity of
|
||
the following bytes is not checked. Tabs in STRING are always
|
||
taken to occupy `tab-width' columns.
|
||
usage: (string-width STRING) */)
|
||
(Lisp_Object str)
|
||
{
|
||
Lisp_Object val;
|
||
|
||
CHECK_STRING (str);
|
||
XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL));
|
||
return val;
|
||
}
|
||
|
||
DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0,
|
||
doc: /* Return the direction of CHAR.
|
||
The returned value is 0 for left-to-right and 1 for right-to-left.
|
||
usage: (char-direction CHAR) */)
|
||
(Lisp_Object ch)
|
||
{
|
||
int c;
|
||
|
||
CHECK_CHARACTER (ch);
|
||
c = XINT (ch);
|
||
return CHAR_TABLE_REF (Vchar_direction_table, c);
|
||
}
|
||
|
||
/* Return the number of characters in the NBYTES bytes at PTR.
|
||
This works by looking at the contents and checking for multibyte
|
||
sequences while assuming that there's no invalid sequence.
|
||
However, if the current buffer has enable-multibyte-characters =
|
||
nil, we treat each byte as a character. */
|
||
|
||
EMACS_INT
|
||
chars_in_text (const unsigned char *ptr, EMACS_INT nbytes)
|
||
{
|
||
/* current_buffer is null at early stages of Emacs initialization. */
|
||
if (current_buffer == 0
|
||
|| NILP (current_buffer->enable_multibyte_characters))
|
||
return nbytes;
|
||
|
||
return multibyte_chars_in_text (ptr, nbytes);
|
||
}
|
||
|
||
/* Return the number of characters in the NBYTES bytes at PTR.
|
||
This works by looking at the contents and checking for multibyte
|
||
sequences while assuming that there's no invalid sequence. It
|
||
ignores enable-multibyte-characters. */
|
||
|
||
EMACS_INT
|
||
multibyte_chars_in_text (const unsigned char *ptr, EMACS_INT nbytes)
|
||
{
|
||
const unsigned char *endp = ptr + nbytes;
|
||
EMACS_INT chars = 0;
|
||
|
||
while (ptr < endp)
|
||
{
|
||
EMACS_INT len = MULTIBYTE_LENGTH (ptr, endp);
|
||
|
||
if (len == 0)
|
||
abort ();
|
||
ptr += len;
|
||
chars++;
|
||
}
|
||
|
||
return chars;
|
||
}
|
||
|
||
/* Parse unibyte text at STR of LEN bytes as a multibyte text, count
|
||
characters and bytes in it, and store them in *NCHARS and *NBYTES
|
||
respectively. On counting bytes, pay attention to that 8-bit
|
||
characters not constructing a valid multibyte sequence are
|
||
represented by 2-byte in a multibyte text. */
|
||
|
||
void
|
||
parse_str_as_multibyte (const unsigned char *str, EMACS_INT len,
|
||
EMACS_INT *nchars, EMACS_INT *nbytes)
|
||
{
|
||
const unsigned char *endp = str + len;
|
||
EMACS_INT n, chars = 0, bytes = 0;
|
||
|
||
if (len >= MAX_MULTIBYTE_LENGTH)
|
||
{
|
||
const unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
|
||
while (str < adjusted_endp)
|
||
{
|
||
if (! CHAR_BYTE8_HEAD_P (*str)
|
||
&& (n = MULTIBYTE_LENGTH_NO_CHECK (str)) > 0)
|
||
str += n, bytes += n;
|
||
else
|
||
str++, bytes += 2;
|
||
chars++;
|
||
}
|
||
}
|
||
while (str < endp)
|
||
{
|
||
if (! CHAR_BYTE8_HEAD_P (*str)
|
||
&& (n = MULTIBYTE_LENGTH (str, endp)) > 0)
|
||
str += n, bytes += n;
|
||
else
|
||
str++, bytes += 2;
|
||
chars++;
|
||
}
|
||
|
||
*nchars = chars;
|
||
*nbytes = bytes;
|
||
return;
|
||
}
|
||
|
||
/* Arrange unibyte text at STR of NBYTES bytes as a multibyte text.
|
||
It actually converts only such 8-bit characters that don't contruct
|
||
a multibyte sequence to multibyte forms of Latin-1 characters. If
|
||
NCHARS is nonzero, set *NCHARS to the number of characters in the
|
||
text. It is assured that we can use LEN bytes at STR as a work
|
||
area and that is enough. Return the number of bytes of the
|
||
resulting text. */
|
||
|
||
EMACS_INT
|
||
str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes,
|
||
EMACS_INT *nchars)
|
||
{
|
||
unsigned char *p = str, *endp = str + nbytes;
|
||
unsigned char *to;
|
||
EMACS_INT chars = 0;
|
||
int n;
|
||
|
||
if (nbytes >= MAX_MULTIBYTE_LENGTH)
|
||
{
|
||
unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
|
||
while (p < adjusted_endp
|
||
&& ! CHAR_BYTE8_HEAD_P (*p)
|
||
&& (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0)
|
||
p += n, chars++;
|
||
}
|
||
while (p < endp
|
||
&& ! CHAR_BYTE8_HEAD_P (*p)
|
||
&& (n = MULTIBYTE_LENGTH (p, endp)) > 0)
|
||
p += n, chars++;
|
||
if (nchars)
|
||
*nchars = chars;
|
||
if (p == endp)
|
||
return nbytes;
|
||
|
||
to = p;
|
||
nbytes = endp - p;
|
||
endp = str + len;
|
||
memmove (endp - nbytes, p, nbytes);
|
||
p = endp - nbytes;
|
||
|
||
if (nbytes >= MAX_MULTIBYTE_LENGTH)
|
||
{
|
||
unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
|
||
while (p < adjusted_endp)
|
||
{
|
||
if (! CHAR_BYTE8_HEAD_P (*p)
|
||
&& (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0)
|
||
{
|
||
while (n--)
|
||
*to++ = *p++;
|
||
}
|
||
else
|
||
{
|
||
int c = *p++;
|
||
c = BYTE8_TO_CHAR (c);
|
||
to += CHAR_STRING (c, to);
|
||
}
|
||
}
|
||
chars++;
|
||
}
|
||
while (p < endp)
|
||
{
|
||
if (! CHAR_BYTE8_HEAD_P (*p)
|
||
&& (n = MULTIBYTE_LENGTH (p, endp)) > 0)
|
||
{
|
||
while (n--)
|
||
*to++ = *p++;
|
||
}
|
||
else
|
||
{
|
||
int c = *p++;
|
||
c = BYTE8_TO_CHAR (c);
|
||
to += CHAR_STRING (c, to);
|
||
}
|
||
chars++;
|
||
}
|
||
if (nchars)
|
||
*nchars = chars;
|
||
return (to - str);
|
||
}
|
||
|
||
/* Parse unibyte string at STR of LEN bytes, and return the number of
|
||
bytes it may ocupy when converted to multibyte string by
|
||
`str_to_multibyte'. */
|
||
|
||
EMACS_INT
|
||
parse_str_to_multibyte (const unsigned char *str, EMACS_INT len)
|
||
{
|
||
const unsigned char *endp = str + len;
|
||
EMACS_INT bytes;
|
||
|
||
for (bytes = 0; str < endp; str++)
|
||
bytes += (*str < 0x80) ? 1 : 2;
|
||
return bytes;
|
||
}
|
||
|
||
|
||
/* Convert unibyte text at STR of NBYTES bytes to a multibyte text
|
||
that contains the same single-byte characters. It actually
|
||
converts all 8-bit characters to multibyte forms. It is assured
|
||
that we can use LEN bytes at STR as a work area and that is
|
||
enough. */
|
||
|
||
EMACS_INT
|
||
str_to_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT bytes)
|
||
{
|
||
unsigned char *p = str, *endp = str + bytes;
|
||
unsigned char *to;
|
||
|
||
while (p < endp && *p < 0x80) p++;
|
||
if (p == endp)
|
||
return bytes;
|
||
to = p;
|
||
bytes = endp - p;
|
||
endp = str + len;
|
||
memmove (endp - bytes, p, bytes);
|
||
p = endp - bytes;
|
||
while (p < endp)
|
||
{
|
||
int c = *p++;
|
||
|
||
if (c >= 0x80)
|
||
c = BYTE8_TO_CHAR (c);
|
||
to += CHAR_STRING (c, to);
|
||
}
|
||
return (to - str);
|
||
}
|
||
|
||
/* Arrange multibyte text at STR of LEN bytes as a unibyte text. It
|
||
actually converts characters in the range 0x80..0xFF to
|
||
unibyte. */
|
||
|
||
EMACS_INT
|
||
str_as_unibyte (unsigned char *str, EMACS_INT bytes)
|
||
{
|
||
const unsigned char *p = str, *endp = str + bytes;
|
||
unsigned char *to;
|
||
int c, len;
|
||
|
||
while (p < endp)
|
||
{
|
||
c = *p;
|
||
len = BYTES_BY_CHAR_HEAD (c);
|
||
if (CHAR_BYTE8_HEAD_P (c))
|
||
break;
|
||
p += len;
|
||
}
|
||
to = str + (p - str);
|
||
while (p < endp)
|
||
{
|
||
c = *p;
|
||
len = BYTES_BY_CHAR_HEAD (c);
|
||
if (CHAR_BYTE8_HEAD_P (c))
|
||
{
|
||
c = STRING_CHAR_ADVANCE (p);
|
||
*to++ = CHAR_TO_BYTE8 (c);
|
||
}
|
||
else
|
||
{
|
||
while (len--) *to++ = *p++;
|
||
}
|
||
}
|
||
return (to - str);
|
||
}
|
||
|
||
/* Convert eight-bit chars in SRC (in multibyte form) to the
|
||
corresponding byte and store in DST. CHARS is the number of
|
||
characters in SRC. The value is the number of bytes stored in DST.
|
||
Usually, the value is the same as CHARS, but is less than it if SRC
|
||
contains a non-ASCII, non-eight-bit characater. If ACCEPT_LATIN_1
|
||
is nonzero, a Latin-1 character is accepted and converted to a byte
|
||
of that character code.
|
||
Note: Currently the arg ACCEPT_LATIN_1 is not used. */
|
||
|
||
EMACS_INT
|
||
str_to_unibyte (const unsigned char *src, unsigned char *dst, EMACS_INT chars, int accept_latin_1)
|
||
{
|
||
EMACS_INT i;
|
||
|
||
for (i = 0; i < chars; i++)
|
||
{
|
||
int c = STRING_CHAR_ADVANCE (src);
|
||
|
||
if (CHAR_BYTE8_P (c))
|
||
c = CHAR_TO_BYTE8 (c);
|
||
else if (! ASCII_CHAR_P (c)
|
||
&& (! accept_latin_1 || c >= 0x100))
|
||
return i;
|
||
*dst++ = c;
|
||
}
|
||
return i;
|
||
}
|
||
|
||
|
||
EMACS_INT
|
||
string_count_byte8 (Lisp_Object string)
|
||
{
|
||
int multibyte = STRING_MULTIBYTE (string);
|
||
EMACS_INT nbytes = SBYTES (string);
|
||
unsigned char *p = SDATA (string);
|
||
unsigned char *pend = p + nbytes;
|
||
EMACS_INT count = 0;
|
||
int c, len;
|
||
|
||
if (multibyte)
|
||
while (p < pend)
|
||
{
|
||
c = *p;
|
||
len = BYTES_BY_CHAR_HEAD (c);
|
||
|
||
if (CHAR_BYTE8_HEAD_P (c))
|
||
count++;
|
||
p += len;
|
||
}
|
||
else
|
||
while (p < pend)
|
||
{
|
||
if (*p++ >= 0x80)
|
||
count++;
|
||
}
|
||
return count;
|
||
}
|
||
|
||
|
||
Lisp_Object
|
||
string_escape_byte8 (Lisp_Object string)
|
||
{
|
||
EMACS_INT nchars = SCHARS (string);
|
||
EMACS_INT nbytes = SBYTES (string);
|
||
int multibyte = STRING_MULTIBYTE (string);
|
||
EMACS_INT byte8_count;
|
||
const unsigned char *src, *src_end;
|
||
unsigned char *dst;
|
||
Lisp_Object val;
|
||
int c, len;
|
||
|
||
if (multibyte && nchars == nbytes)
|
||
return string;
|
||
|
||
byte8_count = string_count_byte8 (string);
|
||
|
||
if (byte8_count == 0)
|
||
return string;
|
||
|
||
if (multibyte)
|
||
{
|
||
if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count
|
||
|| (MOST_POSITIVE_FIXNUM - nbytes) / 2 < byte8_count)
|
||
error ("Maximum string size exceeded");
|
||
|
||
/* Convert 2-byte sequence of byte8 chars to 4-byte octal. */
|
||
val = make_uninit_multibyte_string (nchars + byte8_count * 3,
|
||
nbytes + byte8_count * 2);
|
||
}
|
||
else
|
||
{
|
||
if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count)
|
||
error ("Maximum string size exceeded");
|
||
/* Convert 1-byte sequence of byte8 chars to 4-byte octal. */
|
||
val = make_uninit_string (nbytes + byte8_count * 3);
|
||
}
|
||
|
||
src = SDATA (string);
|
||
src_end = src + nbytes;
|
||
dst = SDATA (val);
|
||
if (multibyte)
|
||
while (src < src_end)
|
||
{
|
||
c = *src;
|
||
len = BYTES_BY_CHAR_HEAD (c);
|
||
|
||
if (CHAR_BYTE8_HEAD_P (c))
|
||
{
|
||
c = STRING_CHAR_ADVANCE (src);
|
||
c = CHAR_TO_BYTE8 (c);
|
||
sprintf ((char *) dst, "\\%03o", c);
|
||
dst += 4;
|
||
}
|
||
else
|
||
while (len--) *dst++ = *src++;
|
||
}
|
||
else
|
||
while (src < src_end)
|
||
{
|
||
c = *src++;
|
||
if (c >= 0x80)
|
||
{
|
||
sprintf ((char *) dst, "\\%03o", c);
|
||
dst += 4;
|
||
}
|
||
else
|
||
*dst++ = c;
|
||
}
|
||
return val;
|
||
}
|
||
|
||
|
||
DEFUN ("string", Fstring, Sstring, 0, MANY, 0,
|
||
doc: /*
|
||
Concatenate all the argument characters and make the result a string.
|
||
usage: (string &rest CHARACTERS) */)
|
||
(int n, Lisp_Object *args)
|
||
{
|
||
int i, c;
|
||
unsigned char *buf, *p;
|
||
Lisp_Object str;
|
||
USE_SAFE_ALLOCA;
|
||
|
||
SAFE_ALLOCA (buf, unsigned char *, MAX_MULTIBYTE_LENGTH * n);
|
||
p = buf;
|
||
|
||
for (i = 0; i < n; i++)
|
||
{
|
||
CHECK_CHARACTER (args[i]);
|
||
c = XINT (args[i]);
|
||
p += CHAR_STRING (c, p);
|
||
}
|
||
|
||
str = make_string_from_bytes ((char *) buf, n, p - buf);
|
||
SAFE_FREE ();
|
||
return str;
|
||
}
|
||
|
||
DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0,
|
||
doc: /* Concatenate all the argument bytes and make the result a unibyte string.
|
||
usage: (unibyte-string &rest BYTES) */)
|
||
(int n, Lisp_Object *args)
|
||
{
|
||
int i, c;
|
||
unsigned char *buf, *p;
|
||
Lisp_Object str;
|
||
USE_SAFE_ALLOCA;
|
||
|
||
SAFE_ALLOCA (buf, unsigned char *, n);
|
||
p = buf;
|
||
|
||
for (i = 0; i < n; i++)
|
||
{
|
||
CHECK_NATNUM (args[i]);
|
||
c = XFASTINT (args[i]);
|
||
if (c >= 256)
|
||
args_out_of_range_3 (args[i], make_number (0), make_number (255));
|
||
*p++ = c;
|
||
}
|
||
|
||
str = make_string_from_bytes ((char *) buf, n, p - buf);
|
||
SAFE_FREE ();
|
||
return str;
|
||
}
|
||
|
||
DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers,
|
||
Schar_resolve_modifiers, 1, 1, 0,
|
||
doc: /* Resolve modifiers in the character CHAR.
|
||
The value is a character with modifiers resolved into the character
|
||
code. Unresolved modifiers are kept in the value.
|
||
usage: (char-resolve-modifiers CHAR) */)
|
||
(Lisp_Object character)
|
||
{
|
||
int c;
|
||
|
||
CHECK_NUMBER (character);
|
||
c = XINT (character);
|
||
return make_number (char_resolve_modifier_mask (c));
|
||
}
|
||
|
||
DEFUN ("get-byte", Fget_byte, Sget_byte, 0, 2, 0,
|
||
doc: /* Return a byte value of a character at point.
|
||
Optional 1st arg POSITION, if non-nil, is a position of a character to get
|
||
a byte value.
|
||
Optional 2nd arg STRING, if non-nil, is a string of which first
|
||
character is a target to get a byte value. In this case, POSITION, if
|
||
non-nil, is an index of a target character in the string.
|
||
|
||
If the current buffer (or STRING) is multibyte, and the target
|
||
character is not ASCII nor 8-bit character, an error is signalled. */)
|
||
(Lisp_Object position, Lisp_Object string)
|
||
{
|
||
int c;
|
||
EMACS_INT pos;
|
||
unsigned char *p;
|
||
|
||
if (NILP (string))
|
||
{
|
||
if (NILP (position))
|
||
{
|
||
p = PT_ADDR;
|
||
}
|
||
else
|
||
{
|
||
CHECK_NUMBER_COERCE_MARKER (position);
|
||
if (XINT (position) < BEGV || XINT (position) >= ZV)
|
||
args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
|
||
pos = XFASTINT (position);
|
||
p = CHAR_POS_ADDR (pos);
|
||
}
|
||
if (NILP (current_buffer->enable_multibyte_characters))
|
||
return make_number (*p);
|
||
}
|
||
else
|
||
{
|
||
CHECK_STRING (string);
|
||
if (NILP (position))
|
||
{
|
||
p = SDATA (string);
|
||
}
|
||
else
|
||
{
|
||
CHECK_NATNUM (position);
|
||
if (XINT (position) >= SCHARS (string))
|
||
args_out_of_range (string, position);
|
||
pos = XFASTINT (position);
|
||
p = SDATA (string) + string_char_to_byte (string, pos);
|
||
}
|
||
if (! STRING_MULTIBYTE (string))
|
||
return make_number (*p);
|
||
}
|
||
c = STRING_CHAR (p);
|
||
if (CHAR_BYTE8_P (c))
|
||
c = CHAR_TO_BYTE8 (c);
|
||
else if (! ASCII_CHAR_P (c))
|
||
error ("Not an ASCII nor an 8-bit character: %d", c);
|
||
return make_number (c);
|
||
}
|
||
|
||
|
||
void
|
||
init_character_once (void)
|
||
{
|
||
}
|
||
|
||
#ifdef emacs
|
||
|
||
void
|
||
syms_of_character (void)
|
||
{
|
||
DEFSYM (Qcharacterp, "characterp");
|
||
DEFSYM (Qauto_fill_chars, "auto-fill-chars");
|
||
|
||
staticpro (&Vchar_unify_table);
|
||
Vchar_unify_table = Qnil;
|
||
|
||
defsubr (&Smax_char);
|
||
defsubr (&Scharacterp);
|
||
defsubr (&Sunibyte_char_to_multibyte);
|
||
defsubr (&Smultibyte_char_to_unibyte);
|
||
defsubr (&Schar_width);
|
||
defsubr (&Sstring_width);
|
||
defsubr (&Schar_direction);
|
||
defsubr (&Sstring);
|
||
defsubr (&Sunibyte_string);
|
||
defsubr (&Schar_resolve_modifiers);
|
||
defsubr (&Sget_byte);
|
||
|
||
DEFVAR_LISP ("translation-table-vector", Vtranslation_table_vector,
|
||
doc: /*
|
||
Vector recording all translation tables ever defined.
|
||
Each element is a pair (SYMBOL . TABLE) relating the table to the
|
||
symbol naming it. The ID of a translation table is an index into this vector. */);
|
||
Vtranslation_table_vector = Fmake_vector (make_number (16), Qnil);
|
||
|
||
DEFVAR_LISP ("auto-fill-chars", Vauto_fill_chars,
|
||
doc: /*
|
||
A char-table for characters which invoke auto-filling.
|
||
Such characters have value t in this table. */);
|
||
Vauto_fill_chars = Fmake_char_table (Qauto_fill_chars, Qnil);
|
||
CHAR_TABLE_SET (Vauto_fill_chars, ' ', Qt);
|
||
CHAR_TABLE_SET (Vauto_fill_chars, '\n', Qt);
|
||
|
||
DEFVAR_LISP ("char-width-table", Vchar_width_table,
|
||
doc: /*
|
||
A char-table for width (columns) of each character. */);
|
||
Vchar_width_table = Fmake_char_table (Qnil, make_number (1));
|
||
char_table_set_range (Vchar_width_table, 0x80, 0x9F, make_number (4));
|
||
char_table_set_range (Vchar_width_table, MAX_5_BYTE_CHAR + 1, MAX_CHAR,
|
||
make_number (4));
|
||
|
||
DEFVAR_LISP ("char-direction-table", Vchar_direction_table,
|
||
doc: /* A char-table for direction of each character. */);
|
||
Vchar_direction_table = Fmake_char_table (Qnil, make_number (1));
|
||
|
||
DEFVAR_LISP ("printable-chars", Vprintable_chars,
|
||
doc: /* A char-table for each printable character. */);
|
||
Vprintable_chars = Fmake_char_table (Qnil, Qnil);
|
||
Fset_char_table_range (Vprintable_chars,
|
||
Fcons (make_number (32), make_number (126)), Qt);
|
||
Fset_char_table_range (Vprintable_chars,
|
||
Fcons (make_number (160),
|
||
make_number (MAX_5_BYTE_CHAR)), Qt);
|
||
|
||
DEFVAR_LISP ("char-script-table", Vchar_script_table,
|
||
doc: /* Char table of script symbols.
|
||
It has one extra slot whose value is a list of script symbols. */);
|
||
|
||
/* Intern this now in case it isn't already done.
|
||
Setting this variable twice is harmless.
|
||
But don't staticpro it here--that is done in alloc.c. */
|
||
Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
|
||
DEFSYM (Qchar_script_table, "char-script-table");
|
||
Fput (Qchar_script_table, Qchar_table_extra_slots, make_number (1));
|
||
Vchar_script_table = Fmake_char_table (Qchar_script_table, Qnil);
|
||
|
||
DEFVAR_LISP ("script-representative-chars", Vscript_representative_chars,
|
||
doc: /* Alist of scripts vs the representative characters.
|
||
Each element is a cons (SCRIPT . CHARS).
|
||
SCRIPT is a symbol representing a script or a subgroup of a script.
|
||
CHARS is a list or a vector of characters.
|
||
If it is a list, all characters in the list are necessary for supporting SCRIPT.
|
||
If it is a vector, one of the characters in the vector is necessary.
|
||
This variable is used to find a font for a specific script. */);
|
||
Vscript_representative_chars = Qnil;
|
||
|
||
DEFVAR_LISP ("unicode-category-table", Vunicode_category_table,
|
||
doc: /* Char table of Unicode's "General Category".
|
||
All Unicode characters have one of the following values (symbol):
|
||
Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Ps, Pe, Pi, Pf, Po,
|
||
Sm, Sc, Sk, So, Zs, Zl, Zp, Cc, Cf, Cs, Co, Cn
|
||
See The Unicode Standard for the meaning of those values. */);
|
||
/* The correct char-table is setup in characters.el. */
|
||
Vunicode_category_table = Qnil;
|
||
}
|
||
|
||
#endif /* emacs */
|
||
|