mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-26 07:00:35 -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.
941 lines
25 KiB
C
941 lines
25 KiB
C
/* Record indices of function doc strings stored in a file.
|
||
Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
|
||
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||
Free Software Foundation, Inc.
|
||
|
||
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/>. */
|
||
|
||
|
||
#include <config.h>
|
||
|
||
#include <sys/types.h>
|
||
#include <sys/file.h> /* Must be after sys/types.h for USG*/
|
||
#include <ctype.h>
|
||
#include <setjmp.h>
|
||
#include <fcntl.h>
|
||
#include <unistd.h>
|
||
|
||
#include "lisp.h"
|
||
#include "buffer.h"
|
||
#include "keyboard.h"
|
||
#include "character.h"
|
||
#include "keymap.h"
|
||
#include "buildobj.h"
|
||
|
||
Lisp_Object Qfunction_documentation;
|
||
|
||
/* Buffer used for reading from documentation file. */
|
||
static char *get_doc_string_buffer;
|
||
static int get_doc_string_buffer_size;
|
||
|
||
static unsigned char *read_bytecode_pointer;
|
||
Lisp_Object Fsnarf_documentation (Lisp_Object);
|
||
|
||
/* readchar in lread.c calls back here to fetch the next byte.
|
||
If UNREADFLAG is 1, we unread a byte. */
|
||
|
||
int
|
||
read_bytecode_char (int unreadflag)
|
||
{
|
||
if (unreadflag)
|
||
{
|
||
read_bytecode_pointer--;
|
||
return 0;
|
||
}
|
||
return *read_bytecode_pointer++;
|
||
}
|
||
|
||
/* Extract a doc string from a file. FILEPOS says where to get it.
|
||
If it is an integer, use that position in the standard DOC-... file.
|
||
If it is (FILE . INTEGER), use FILE as the file name
|
||
and INTEGER as the position in that file.
|
||
But if INTEGER is negative, make it positive.
|
||
(A negative integer is used for user variables, so we can distinguish
|
||
them without actually fetching the doc string.)
|
||
|
||
If the location does not point to the beginning of a docstring
|
||
(e.g. because the file has been modified and the location is stale),
|
||
return nil.
|
||
|
||
If UNIBYTE is nonzero, always make a unibyte string.
|
||
|
||
If DEFINITION is nonzero, assume this is for reading
|
||
a dynamic function definition; convert the bytestring
|
||
and the constants vector with appropriate byte handling,
|
||
and return a cons cell. */
|
||
|
||
Lisp_Object
|
||
get_doc_string (Lisp_Object filepos, int unibyte, int definition)
|
||
{
|
||
char *from, *to;
|
||
register int fd;
|
||
register char *name;
|
||
register char *p, *p1;
|
||
EMACS_INT minsize;
|
||
EMACS_INT offset, position;
|
||
Lisp_Object file, tem;
|
||
|
||
if (INTEGERP (filepos))
|
||
{
|
||
file = Vdoc_file_name;
|
||
position = XINT (filepos);
|
||
}
|
||
else if (CONSP (filepos))
|
||
{
|
||
file = XCAR (filepos);
|
||
position = XINT (XCDR (filepos));
|
||
}
|
||
else
|
||
return Qnil;
|
||
|
||
if (position < 0)
|
||
position = - position;
|
||
|
||
if (!STRINGP (Vdoc_directory))
|
||
return Qnil;
|
||
|
||
if (!STRINGP (file))
|
||
return Qnil;
|
||
|
||
/* Put the file name in NAME as a C string.
|
||
If it is relative, combine it with Vdoc_directory. */
|
||
|
||
tem = Ffile_name_absolute_p (file);
|
||
if (NILP (tem))
|
||
{
|
||
minsize = SCHARS (Vdoc_directory);
|
||
/* sizeof ("../etc/") == 8 */
|
||
if (minsize < 8)
|
||
minsize = 8;
|
||
name = (char *) alloca (minsize + SCHARS (file) + 8);
|
||
strcpy (name, SDATA (Vdoc_directory));
|
||
strcat (name, SDATA (file));
|
||
}
|
||
else
|
||
{
|
||
name = (char *) SDATA (file);
|
||
}
|
||
|
||
fd = emacs_open (name, O_RDONLY, 0);
|
||
if (fd < 0)
|
||
{
|
||
#ifndef CANNOT_DUMP
|
||
if (!NILP (Vpurify_flag))
|
||
{
|
||
/* Preparing to dump; DOC file is probably not installed.
|
||
So check in ../etc. */
|
||
strcpy (name, "../etc/");
|
||
strcat (name, SDATA (file));
|
||
|
||
fd = emacs_open (name, O_RDONLY, 0);
|
||
}
|
||
#endif
|
||
if (fd < 0)
|
||
error ("Cannot open doc string file \"%s\"", name);
|
||
}
|
||
|
||
/* Seek only to beginning of disk block. */
|
||
/* Make sure we read at least 1024 bytes before `position'
|
||
so we can check the leading text for consistency. */
|
||
offset = min (position, max (1024, position % (8 * 1024)));
|
||
if (0 > lseek (fd, position - offset, 0))
|
||
{
|
||
emacs_close (fd);
|
||
error ("Position %ld out of range in doc string file \"%s\"",
|
||
position, name);
|
||
}
|
||
|
||
/* Read the doc string into get_doc_string_buffer.
|
||
P points beyond the data just read. */
|
||
|
||
p = get_doc_string_buffer;
|
||
while (1)
|
||
{
|
||
EMACS_INT space_left = (get_doc_string_buffer_size
|
||
- (p - get_doc_string_buffer));
|
||
int nread;
|
||
|
||
/* Allocate or grow the buffer if we need to. */
|
||
if (space_left == 0)
|
||
{
|
||
EMACS_INT in_buffer = p - get_doc_string_buffer;
|
||
get_doc_string_buffer_size += 16 * 1024;
|
||
get_doc_string_buffer
|
||
= (char *) xrealloc (get_doc_string_buffer,
|
||
get_doc_string_buffer_size + 1);
|
||
p = get_doc_string_buffer + in_buffer;
|
||
space_left = (get_doc_string_buffer_size
|
||
- (p - get_doc_string_buffer));
|
||
}
|
||
|
||
/* Read a disk block at a time.
|
||
If we read the same block last time, maybe skip this? */
|
||
if (space_left > 1024 * 8)
|
||
space_left = 1024 * 8;
|
||
nread = emacs_read (fd, p, space_left);
|
||
if (nread < 0)
|
||
{
|
||
emacs_close (fd);
|
||
error ("Read error on documentation file");
|
||
}
|
||
p[nread] = 0;
|
||
if (!nread)
|
||
break;
|
||
if (p == get_doc_string_buffer)
|
||
p1 = strchr (p + offset, '\037');
|
||
else
|
||
p1 = strchr (p, '\037');
|
||
if (p1)
|
||
{
|
||
*p1 = 0;
|
||
p = p1;
|
||
break;
|
||
}
|
||
p += nread;
|
||
}
|
||
emacs_close (fd);
|
||
|
||
/* Sanity checking. */
|
||
if (CONSP (filepos))
|
||
{
|
||
int test = 1;
|
||
if (get_doc_string_buffer[offset - test++] != ' ')
|
||
return Qnil;
|
||
while (get_doc_string_buffer[offset - test] >= '0'
|
||
&& get_doc_string_buffer[offset - test] <= '9')
|
||
test++;
|
||
if (get_doc_string_buffer[offset - test++] != '@'
|
||
|| get_doc_string_buffer[offset - test] != '#')
|
||
return Qnil;
|
||
}
|
||
else
|
||
{
|
||
int test = 1;
|
||
if (get_doc_string_buffer[offset - test++] != '\n')
|
||
return Qnil;
|
||
while (get_doc_string_buffer[offset - test] > ' ')
|
||
test++;
|
||
if (get_doc_string_buffer[offset - test] != '\037')
|
||
return Qnil;
|
||
}
|
||
|
||
/* Scan the text and perform quoting with ^A (char code 1).
|
||
^A^A becomes ^A, ^A0 becomes a null char, and ^A_ becomes a ^_. */
|
||
from = get_doc_string_buffer + offset;
|
||
to = get_doc_string_buffer + offset;
|
||
while (from != p)
|
||
{
|
||
if (*from == 1)
|
||
{
|
||
int c;
|
||
|
||
from++;
|
||
c = *from++;
|
||
if (c == 1)
|
||
*to++ = c;
|
||
else if (c == '0')
|
||
*to++ = 0;
|
||
else if (c == '_')
|
||
*to++ = 037;
|
||
else
|
||
error ("Invalid data in documentation file -- ^A followed by code 0%o", c);
|
||
}
|
||
else
|
||
*to++ = *from++;
|
||
}
|
||
|
||
/* If DEFINITION, read from this buffer
|
||
the same way we would read bytes from a file. */
|
||
if (definition)
|
||
{
|
||
read_bytecode_pointer = get_doc_string_buffer + offset;
|
||
return Fread (Qlambda);
|
||
}
|
||
|
||
if (unibyte)
|
||
return make_unibyte_string (get_doc_string_buffer + offset,
|
||
to - (get_doc_string_buffer + offset));
|
||
else
|
||
{
|
||
/* The data determines whether the string is multibyte. */
|
||
EMACS_INT nchars = multibyte_chars_in_text (get_doc_string_buffer + offset,
|
||
to - (get_doc_string_buffer + offset));
|
||
return make_string_from_bytes (get_doc_string_buffer + offset,
|
||
nchars,
|
||
to - (get_doc_string_buffer + offset));
|
||
}
|
||
}
|
||
|
||
/* Get a string from position FILEPOS and pass it through the Lisp reader.
|
||
We use this for fetching the bytecode string and constants vector
|
||
of a compiled function from the .elc file. */
|
||
|
||
Lisp_Object
|
||
read_doc_string (Lisp_Object filepos)
|
||
{
|
||
return get_doc_string (filepos, 0, 1);
|
||
}
|
||
|
||
static int
|
||
reread_doc_file (Lisp_Object file)
|
||
{
|
||
#if 0
|
||
Lisp_Object reply, prompt[3];
|
||
struct gcpro gcpro1;
|
||
GCPRO1 (file);
|
||
prompt[0] = build_string ("File ");
|
||
prompt[1] = NILP (file) ? Vdoc_file_name : file;
|
||
prompt[2] = build_string (" is out of sync. Reload? ");
|
||
reply = Fy_or_n_p (Fconcat (3, prompt));
|
||
UNGCPRO;
|
||
if (NILP (reply))
|
||
return 0;
|
||
#endif
|
||
|
||
if (NILP (file))
|
||
Fsnarf_documentation (Vdoc_file_name);
|
||
else
|
||
Fload (file, Qt, Qt, Qt, Qnil);
|
||
|
||
return 1;
|
||
}
|
||
|
||
DEFUN ("documentation", Fdocumentation, Sdocumentation, 1, 2, 0,
|
||
doc: /* Return the documentation string of FUNCTION.
|
||
Unless a non-nil second argument RAW is given, the
|
||
string is passed through `substitute-command-keys'. */)
|
||
(Lisp_Object function, Lisp_Object raw)
|
||
{
|
||
Lisp_Object fun;
|
||
Lisp_Object funcar;
|
||
Lisp_Object tem, doc;
|
||
int try_reload = 1;
|
||
|
||
documentation:
|
||
|
||
doc = Qnil;
|
||
|
||
if (SYMBOLP (function)
|
||
&& (tem = Fget (function, Qfunction_documentation),
|
||
!NILP (tem)))
|
||
return Fdocumentation_property (function, Qfunction_documentation, raw);
|
||
|
||
fun = Findirect_function (function, Qnil);
|
||
if (SUBRP (fun))
|
||
{
|
||
if (XSUBR (fun)->doc == 0)
|
||
return Qnil;
|
||
else if ((EMACS_INT) XSUBR (fun)->doc >= 0)
|
||
doc = build_string (XSUBR (fun)->doc);
|
||
else
|
||
doc = make_number ((EMACS_INT) XSUBR (fun)->doc);
|
||
}
|
||
else if (COMPILEDP (fun))
|
||
{
|
||
if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) <= COMPILED_DOC_STRING)
|
||
return Qnil;
|
||
tem = AREF (fun, COMPILED_DOC_STRING);
|
||
if (STRINGP (tem))
|
||
doc = tem;
|
||
else if (NATNUMP (tem) || CONSP (tem))
|
||
doc = tem;
|
||
else
|
||
return Qnil;
|
||
}
|
||
else if (STRINGP (fun) || VECTORP (fun))
|
||
{
|
||
return build_string ("Keyboard macro.");
|
||
}
|
||
else if (CONSP (fun))
|
||
{
|
||
funcar = Fcar (fun);
|
||
if (!SYMBOLP (funcar))
|
||
xsignal1 (Qinvalid_function, fun);
|
||
else if (EQ (funcar, Qkeymap))
|
||
return build_string ("Prefix command (definition is a keymap associating keystrokes with commands).");
|
||
else if (EQ (funcar, Qlambda)
|
||
|| EQ (funcar, Qautoload))
|
||
{
|
||
Lisp_Object tem1;
|
||
tem1 = Fcdr (Fcdr (fun));
|
||
tem = Fcar (tem1);
|
||
if (STRINGP (tem))
|
||
doc = tem;
|
||
/* Handle a doc reference--but these never come last
|
||
in the function body, so reject them if they are last. */
|
||
else if ((NATNUMP (tem) || (CONSP (tem) && INTEGERP (XCDR (tem))))
|
||
&& !NILP (XCDR (tem1)))
|
||
doc = tem;
|
||
else
|
||
return Qnil;
|
||
}
|
||
else if (EQ (funcar, Qmacro))
|
||
return Fdocumentation (Fcdr (fun), raw);
|
||
else
|
||
goto oops;
|
||
}
|
||
else
|
||
{
|
||
oops:
|
||
xsignal1 (Qinvalid_function, fun);
|
||
}
|
||
|
||
/* Check for an advised function. Its doc string
|
||
has an `ad-advice-info' text property. */
|
||
if (STRINGP (doc))
|
||
{
|
||
Lisp_Object innerfunc;
|
||
innerfunc = Fget_text_property (make_number (0),
|
||
intern ("ad-advice-info"),
|
||
doc);
|
||
if (! NILP (innerfunc))
|
||
doc = call1 (intern ("ad-make-advised-docstring"), innerfunc);
|
||
}
|
||
|
||
/* If DOC is 0, it's typically because of a dumped file missing
|
||
from the DOC file (bug in src/Makefile.in). */
|
||
if (EQ (doc, make_number (0)))
|
||
doc = Qnil;
|
||
if (INTEGERP (doc) || CONSP (doc))
|
||
{
|
||
Lisp_Object tem;
|
||
tem = get_doc_string (doc, 0, 0);
|
||
if (NILP (tem) && try_reload)
|
||
{
|
||
/* The file is newer, we need to reset the pointers. */
|
||
struct gcpro gcpro1, gcpro2;
|
||
GCPRO2 (function, raw);
|
||
try_reload = reread_doc_file (Fcar_safe (doc));
|
||
UNGCPRO;
|
||
if (try_reload)
|
||
{
|
||
try_reload = 0;
|
||
goto documentation;
|
||
}
|
||
}
|
||
else
|
||
doc = tem;
|
||
}
|
||
|
||
if (NILP (raw))
|
||
doc = Fsubstitute_command_keys (doc);
|
||
return doc;
|
||
}
|
||
|
||
DEFUN ("documentation-property", Fdocumentation_property,
|
||
Sdocumentation_property, 2, 3, 0,
|
||
doc: /* Return the documentation string that is SYMBOL's PROP property.
|
||
Third argument RAW omitted or nil means pass the result through
|
||
`substitute-command-keys' if it is a string.
|
||
|
||
This differs from `get' in that it can refer to strings stored in the
|
||
`etc/DOC' file; and that it evaluates documentation properties that
|
||
aren't strings. */)
|
||
(Lisp_Object symbol, Lisp_Object prop, Lisp_Object raw)
|
||
{
|
||
int try_reload = 1;
|
||
Lisp_Object tem;
|
||
|
||
documentation_property:
|
||
|
||
tem = Fget (symbol, prop);
|
||
if (EQ (tem, make_number (0)))
|
||
tem = Qnil;
|
||
if (INTEGERP (tem) || (CONSP (tem) && INTEGERP (XCDR (tem))))
|
||
{
|
||
Lisp_Object doc = tem;
|
||
tem = get_doc_string (tem, 0, 0);
|
||
if (NILP (tem) && try_reload)
|
||
{
|
||
/* The file is newer, we need to reset the pointers. */
|
||
struct gcpro gcpro1, gcpro2, gcpro3;
|
||
GCPRO3 (symbol, prop, raw);
|
||
try_reload = reread_doc_file (Fcar_safe (doc));
|
||
UNGCPRO;
|
||
if (try_reload)
|
||
{
|
||
try_reload = 0;
|
||
goto documentation_property;
|
||
}
|
||
}
|
||
}
|
||
else if (!STRINGP (tem))
|
||
/* Feval protects its argument. */
|
||
tem = Feval (tem);
|
||
|
||
if (NILP (raw) && STRINGP (tem))
|
||
tem = Fsubstitute_command_keys (tem);
|
||
return tem;
|
||
}
|
||
|
||
/* Scanning the DOC files and placing docstring offsets into functions. */
|
||
|
||
static void
|
||
store_function_docstring (Lisp_Object fun, EMACS_INT offset)
|
||
/* Use EMACS_INT because we get offset from pointer subtraction. */
|
||
{
|
||
fun = indirect_function (fun);
|
||
|
||
/* The type determines where the docstring is stored. */
|
||
|
||
/* Lisp_Subrs have a slot for it. */
|
||
if (SUBRP (fun))
|
||
XSUBR (fun)->doc = (char *) - offset;
|
||
|
||
/* If it's a lisp form, stick it in the form. */
|
||
else if (CONSP (fun))
|
||
{
|
||
Lisp_Object tem;
|
||
|
||
tem = XCAR (fun);
|
||
if (EQ (tem, Qlambda) || EQ (tem, Qautoload))
|
||
{
|
||
tem = Fcdr (Fcdr (fun));
|
||
if (CONSP (tem) && INTEGERP (XCAR (tem)))
|
||
XSETCAR (tem, make_number (offset));
|
||
}
|
||
else if (EQ (tem, Qmacro))
|
||
store_function_docstring (XCDR (fun), offset);
|
||
}
|
||
|
||
/* Bytecode objects sometimes have slots for it. */
|
||
else if (COMPILEDP (fun))
|
||
{
|
||
/* This bytecode object must have a slot for the
|
||
docstring, since we've found a docstring for it. */
|
||
if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_DOC_STRING)
|
||
ASET (fun, COMPILED_DOC_STRING, make_number (offset));
|
||
}
|
||
}
|
||
|
||
static const char buildobj[] = BUILDOBJ;
|
||
|
||
DEFUN ("Snarf-documentation", Fsnarf_documentation, Ssnarf_documentation,
|
||
1, 1, 0,
|
||
doc: /* Used during Emacs initialization to scan the `etc/DOC...' file.
|
||
This searches the `etc/DOC...' file for doc strings and
|
||
records them in function and variable definitions.
|
||
The function takes one argument, FILENAME, a string;
|
||
it specifies the file name (without a directory) of the DOC file.
|
||
That file is found in `../etc' now; later, when the dumped Emacs is run,
|
||
the same file name is found in the `doc-directory'. */)
|
||
(Lisp_Object filename)
|
||
{
|
||
int fd;
|
||
char buf[1024 + 1];
|
||
register EMACS_INT filled;
|
||
register EMACS_INT pos;
|
||
register char *p, *end;
|
||
Lisp_Object sym;
|
||
char *name;
|
||
int skip_file = 0;
|
||
|
||
CHECK_STRING (filename);
|
||
|
||
if
|
||
#ifndef CANNOT_DUMP
|
||
(!NILP (Vpurify_flag))
|
||
#else /* CANNOT_DUMP */
|
||
(0)
|
||
#endif /* CANNOT_DUMP */
|
||
{
|
||
name = (char *) alloca (SCHARS (filename) + 14);
|
||
strcpy (name, "../etc/");
|
||
}
|
||
else
|
||
{
|
||
CHECK_STRING (Vdoc_directory);
|
||
name = (char *) alloca (SCHARS (filename)
|
||
+ SCHARS (Vdoc_directory) + 1);
|
||
strcpy (name, SDATA (Vdoc_directory));
|
||
}
|
||
strcat (name, SDATA (filename)); /*** Add this line ***/
|
||
|
||
/* Vbuild_files is nil when temacs is run, and non-nil after that. */
|
||
if (NILP (Vbuild_files))
|
||
{
|
||
const char *beg, *end;
|
||
|
||
for (beg = buildobj; *beg; beg = end)
|
||
{
|
||
EMACS_INT len;
|
||
|
||
while (*beg && isspace (*beg)) ++beg;
|
||
|
||
for (end = beg; *end && ! isspace (*end); ++end)
|
||
if (*end == '/') beg = end+1; /* skip directory part */
|
||
|
||
len = end - beg;
|
||
if (len > 4 && end[-4] == '.' && end[-3] == 'o')
|
||
len -= 2; /* Just take .o if it ends in .obj */
|
||
|
||
if (len > 0)
|
||
Vbuild_files = Fcons (make_string (beg, len), Vbuild_files);
|
||
}
|
||
Vbuild_files = Fpurecopy (Vbuild_files);
|
||
}
|
||
|
||
fd = emacs_open (name, O_RDONLY, 0);
|
||
if (fd < 0)
|
||
report_file_error ("Opening doc string file",
|
||
Fcons (build_string (name), Qnil));
|
||
Vdoc_file_name = filename;
|
||
filled = 0;
|
||
pos = 0;
|
||
while (1)
|
||
{
|
||
if (filled < 512)
|
||
filled += emacs_read (fd, &buf[filled], sizeof buf - 1 - filled);
|
||
if (!filled)
|
||
break;
|
||
|
||
buf[filled] = 0;
|
||
p = buf;
|
||
end = buf + (filled < 512 ? filled : filled - 128);
|
||
while (p != end && *p != '\037') p++;
|
||
/* p points to ^_Ffunctionname\n or ^_Vvarname\n or ^_Sfilename\n. */
|
||
if (p != end)
|
||
{
|
||
end = strchr (p, '\n');
|
||
|
||
/* See if this is a file name, and if it is a file in build-files. */
|
||
if (p[1] == 'S')
|
||
{
|
||
skip_file = 0;
|
||
if (end - p > 4 && end[-2] == '.'
|
||
&& (end[-1] == 'o' || end[-1] == 'c'))
|
||
{
|
||
EMACS_INT len = end - p - 2;
|
||
char *fromfile = alloca (len + 1);
|
||
strncpy (fromfile, &p[2], len);
|
||
fromfile[len] = 0;
|
||
if (fromfile[len-1] == 'c')
|
||
fromfile[len-1] = 'o';
|
||
|
||
skip_file = NILP (Fmember (build_string (fromfile),
|
||
Vbuild_files));
|
||
}
|
||
}
|
||
|
||
sym = oblookup (Vobarray, p + 2,
|
||
multibyte_chars_in_text (p + 2, end - p - 2),
|
||
end - p - 2);
|
||
/* Check skip_file so that when a function is defined several
|
||
times in different files (typically, once in xterm, once in
|
||
w32term, ...), we only pay attention to the one that
|
||
matters. */
|
||
if (! skip_file && SYMBOLP (sym))
|
||
{
|
||
/* Attach a docstring to a variable? */
|
||
if (p[1] == 'V')
|
||
{
|
||
/* Install file-position as variable-documentation property
|
||
and make it negative for a user-variable
|
||
(doc starts with a `*'). */
|
||
Fput (sym, Qvariable_documentation,
|
||
make_number ((pos + end + 1 - buf)
|
||
* (end[1] == '*' ? -1 : 1)));
|
||
}
|
||
|
||
/* Attach a docstring to a function? */
|
||
else if (p[1] == 'F')
|
||
store_function_docstring (sym, pos + end + 1 - buf);
|
||
|
||
else if (p[1] == 'S')
|
||
; /* Just a source file name boundary marker. Ignore it. */
|
||
|
||
else
|
||
error ("DOC file invalid at position %d", pos);
|
||
}
|
||
}
|
||
pos += end - buf;
|
||
filled -= end - buf;
|
||
memmove (buf, end, filled);
|
||
}
|
||
emacs_close (fd);
|
||
return Qnil;
|
||
}
|
||
|
||
DEFUN ("substitute-command-keys", Fsubstitute_command_keys,
|
||
Ssubstitute_command_keys, 1, 1, 0,
|
||
doc: /* Substitute key descriptions for command names in STRING.
|
||
Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
|
||
sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
|
||
on any keys.
|
||
Substrings of the form \\=\\{MAPVAR} are replaced by summaries
|
||
\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
|
||
Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
|
||
as the keymap for future \\=\\[COMMAND] substrings.
|
||
\\=\\= quotes the following character and is discarded;
|
||
thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
|
||
|
||
Returns original STRING if no substitutions were made. Otherwise,
|
||
a new string, without any text properties, is returned. */)
|
||
(Lisp_Object string)
|
||
{
|
||
unsigned char *buf;
|
||
int changed = 0;
|
||
register unsigned char *strp;
|
||
register unsigned char *bufp;
|
||
EMACS_INT idx;
|
||
EMACS_INT bsize;
|
||
Lisp_Object tem;
|
||
Lisp_Object keymap;
|
||
unsigned char *start;
|
||
EMACS_INT length, length_byte;
|
||
Lisp_Object name;
|
||
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
|
||
int multibyte;
|
||
EMACS_INT nchars;
|
||
|
||
if (NILP (string))
|
||
return Qnil;
|
||
|
||
CHECK_STRING (string);
|
||
tem = Qnil;
|
||
keymap = Qnil;
|
||
name = Qnil;
|
||
GCPRO4 (string, tem, keymap, name);
|
||
|
||
multibyte = STRING_MULTIBYTE (string);
|
||
nchars = 0;
|
||
|
||
/* KEYMAP is either nil (which means search all the active keymaps)
|
||
or a specified local map (which means search just that and the
|
||
global map). If non-nil, it might come from Voverriding_local_map,
|
||
or from a \\<mapname> construct in STRING itself.. */
|
||
keymap = current_kboard->Voverriding_terminal_local_map;
|
||
if (NILP (keymap))
|
||
keymap = Voverriding_local_map;
|
||
|
||
bsize = SBYTES (string);
|
||
bufp = buf = (unsigned char *) xmalloc (bsize);
|
||
|
||
strp = SDATA (string);
|
||
while (strp < SDATA (string) + SBYTES (string))
|
||
{
|
||
if (strp[0] == '\\' && strp[1] == '=')
|
||
{
|
||
/* \= quotes the next character;
|
||
thus, to put in \[ without its special meaning, use \=\[. */
|
||
changed = 1;
|
||
strp += 2;
|
||
if (multibyte)
|
||
{
|
||
int len;
|
||
|
||
STRING_CHAR_AND_LENGTH (strp, len);
|
||
if (len == 1)
|
||
*bufp = *strp;
|
||
else
|
||
memcpy (bufp, strp, len);
|
||
strp += len;
|
||
bufp += len;
|
||
nchars++;
|
||
}
|
||
else
|
||
*bufp++ = *strp++, nchars++;
|
||
}
|
||
else if (strp[0] == '\\' && strp[1] == '[')
|
||
{
|
||
EMACS_INT start_idx;
|
||
int follow_remap = 1;
|
||
|
||
changed = 1;
|
||
strp += 2; /* skip \[ */
|
||
start = strp;
|
||
start_idx = start - SDATA (string);
|
||
|
||
while ((strp - SDATA (string)
|
||
< SBYTES (string))
|
||
&& *strp != ']')
|
||
strp++;
|
||
length_byte = strp - start;
|
||
|
||
strp++; /* skip ] */
|
||
|
||
/* Save STRP in IDX. */
|
||
idx = strp - SDATA (string);
|
||
name = Fintern (make_string (start, length_byte), Qnil);
|
||
|
||
do_remap:
|
||
tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
|
||
|
||
if (VECTORP (tem) && XVECTOR (tem)->size > 1
|
||
&& EQ (AREF (tem, 0), Qremap) && SYMBOLP (AREF (tem, 1))
|
||
&& follow_remap)
|
||
{
|
||
name = AREF (tem, 1);
|
||
follow_remap = 0;
|
||
goto do_remap;
|
||
}
|
||
|
||
/* Note the Fwhere_is_internal can GC, so we have to take
|
||
relocation of string contents into account. */
|
||
strp = SDATA (string) + idx;
|
||
start = SDATA (string) + start_idx;
|
||
|
||
if (NILP (tem)) /* but not on any keys */
|
||
{
|
||
EMACS_INT offset = bufp - buf;
|
||
buf = (unsigned char *) xrealloc (buf, bsize += 4);
|
||
bufp = buf + offset;
|
||
memcpy (bufp, "M-x ", 4);
|
||
bufp += 4;
|
||
nchars += 4;
|
||
if (multibyte)
|
||
length = multibyte_chars_in_text (start, length_byte);
|
||
else
|
||
length = length_byte;
|
||
goto subst;
|
||
}
|
||
else
|
||
{ /* function is on a key */
|
||
tem = Fkey_description (tem, Qnil);
|
||
goto subst_string;
|
||
}
|
||
}
|
||
/* \{foo} is replaced with a summary of the keymap (symbol-value foo).
|
||
\<foo> just sets the keymap used for \[cmd]. */
|
||
else if (strp[0] == '\\' && (strp[1] == '{' || strp[1] == '<'))
|
||
{
|
||
struct buffer *oldbuf;
|
||
EMACS_INT start_idx;
|
||
/* This is for computing the SHADOWS arg for describe_map_tree. */
|
||
Lisp_Object active_maps = Fcurrent_active_maps (Qnil, Qnil);
|
||
Lisp_Object earlier_maps;
|
||
|
||
changed = 1;
|
||
strp += 2; /* skip \{ or \< */
|
||
start = strp;
|
||
start_idx = start - SDATA (string);
|
||
|
||
while ((strp - SDATA (string) < SBYTES (string))
|
||
&& *strp != '}' && *strp != '>')
|
||
strp++;
|
||
|
||
length_byte = strp - start;
|
||
strp++; /* skip } or > */
|
||
|
||
/* Save STRP in IDX. */
|
||
idx = strp - SDATA (string);
|
||
|
||
/* Get the value of the keymap in TEM, or nil if undefined.
|
||
Do this while still in the user's current buffer
|
||
in case it is a local variable. */
|
||
name = Fintern (make_string (start, length_byte), Qnil);
|
||
tem = Fboundp (name);
|
||
if (! NILP (tem))
|
||
{
|
||
tem = Fsymbol_value (name);
|
||
if (! NILP (tem))
|
||
{
|
||
tem = get_keymap (tem, 0, 1);
|
||
/* Note that get_keymap can GC. */
|
||
strp = SDATA (string) + idx;
|
||
start = SDATA (string) + start_idx;
|
||
}
|
||
}
|
||
|
||
/* Now switch to a temp buffer. */
|
||
oldbuf = current_buffer;
|
||
set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
|
||
|
||
if (NILP (tem))
|
||
{
|
||
name = Fsymbol_name (name);
|
||
insert_string ("\nUses keymap \"");
|
||
insert_from_string (name, 0, 0,
|
||
SCHARS (name),
|
||
SBYTES (name), 1);
|
||
insert_string ("\", which is not currently defined.\n");
|
||
if (start[-1] == '<') keymap = Qnil;
|
||
}
|
||
else if (start[-1] == '<')
|
||
keymap = tem;
|
||
else
|
||
{
|
||
/* Get the list of active keymaps that precede this one.
|
||
If this one's not active, get nil. */
|
||
earlier_maps = Fcdr (Fmemq (tem, Freverse (active_maps)));
|
||
describe_map_tree (tem, 1, Fnreverse (earlier_maps),
|
||
Qnil, (char *)0, 1, 0, 0, 1);
|
||
}
|
||
tem = Fbuffer_string ();
|
||
Ferase_buffer ();
|
||
set_buffer_internal (oldbuf);
|
||
|
||
subst_string:
|
||
start = SDATA (tem);
|
||
length = SCHARS (tem);
|
||
length_byte = SBYTES (tem);
|
||
subst:
|
||
{
|
||
EMACS_INT offset = bufp - buf;
|
||
buf = (unsigned char *) xrealloc (buf, bsize += length_byte);
|
||
bufp = buf + offset;
|
||
memcpy (bufp, start, length_byte);
|
||
bufp += length_byte;
|
||
nchars += length;
|
||
/* Check STRING again in case gc relocated it. */
|
||
strp = (unsigned char *) SDATA (string) + idx;
|
||
}
|
||
}
|
||
else if (! multibyte) /* just copy other chars */
|
||
*bufp++ = *strp++, nchars++;
|
||
else
|
||
{
|
||
int len;
|
||
|
||
STRING_CHAR_AND_LENGTH (strp, len);
|
||
if (len == 1)
|
||
*bufp = *strp;
|
||
else
|
||
memcpy (bufp, strp, len);
|
||
strp += len;
|
||
bufp += len;
|
||
nchars++;
|
||
}
|
||
}
|
||
|
||
if (changed) /* don't bother if nothing substituted */
|
||
tem = make_string_from_bytes (buf, nchars, bufp - buf);
|
||
else
|
||
tem = string;
|
||
xfree (buf);
|
||
RETURN_UNGCPRO (tem);
|
||
}
|
||
|
||
void
|
||
syms_of_doc (void)
|
||
{
|
||
Qfunction_documentation = intern_c_string ("function-documentation");
|
||
staticpro (&Qfunction_documentation);
|
||
|
||
DEFVAR_LISP ("internal-doc-file-name", Vdoc_file_name,
|
||
doc: /* Name of file containing documentation strings of built-in symbols. */);
|
||
Vdoc_file_name = Qnil;
|
||
|
||
DEFVAR_LISP ("build-files", Vbuild_files,
|
||
doc: /* A list of files used to build this Emacs binary. */);
|
||
Vbuild_files = Qnil;
|
||
|
||
defsubr (&Sdocumentation);
|
||
defsubr (&Sdocumentation_property);
|
||
defsubr (&Ssnarf_documentation);
|
||
defsubr (&Ssubstitute_command_keys);
|
||
}
|
||
|