emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 112364:42e22c4f06b7

Move all DEFVAR'd globals into a structure -- threading infrastructure * 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.

author	Tom Tromey <tromey@redhat.com>
date	Tue, 18 Jan 2011 13:45:37 -0700
parents	116a3428737d
children	9de5a68b57e1

comparison

equal deleted inserted replaced

-:6a0c66185ba1
+:42e22c4f06b7
 #endif
 #define INFINITY 10000000
 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
-Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
+Lisp_Object Qwindow_scroll_functions;
-Lisp_Object Qwindow_text_change_functions, Vwindow_text_change_functions;
+Lisp_Object Qwindow_text_change_functions;
-Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
+Lisp_Object Qredisplay_end_trigger_functions;
 Lisp_Object Qinhibit_point_motion_hooks;
 Lisp_Object QCeval, QCfile, QCdata, QCpropertize;
 Lisp_Object Qfontified;
 Lisp_Object Qgrow_only;
 Lisp_Object Qinhibit_eval_during_redisplay;
 Lisp_Object Qarrow, Qhand, Qtext;
 /* Holds the list (error).  */
 Lisp_Object list_of_error;
-/* Functions called to fontify regions of text.  */
-Lisp_Object Vfontification_functions;
 Lisp_Object Qfontification_functions;
-/* Non-nil means automatically select any window when the mouse
+Lisp_Object Qwrap_prefix;
-cursor moves into it.  */
+Lisp_Object Qline_prefix;
-Lisp_Object Vmouse_autoselect_window;
-Lisp_Object Vwrap_prefix, Qwrap_prefix;
-Lisp_Object Vline_prefix, Qline_prefix;
-/* Non-zero means draw tool bar buttons raised when the mouse moves
-over them.  */
-int auto_raise_tool_bar_buttons_p;
-/* Non-zero means to reposition window if cursor line is only partially visible.  */
-int make_cursor_line_fully_visible_p;
-/* Margin below tool bar in pixels.  0 or nil means no margin.
-If value is `internal-border-width' or `border-width',
-the corresponding frame parameter is used.  */
-Lisp_Object Vtool_bar_border;
-/* Margin around tool bar buttons in pixels.  */
-Lisp_Object Vtool_bar_button_margin;
-/* Thickness of shadow to draw around tool bar buttons.  */
-EMACS_INT tool_bar_button_relief;
-/* Non-nil means automatically resize tool-bars so that all tool-bar
-items are visible, and no blank lines remain.
-If value is `grow-only', only make tool-bar bigger.  */
-Lisp_Object Vauto_resize_tool_bars;
-/* Type of tool bar.  Can be symbols image, text, both or both-hroiz.  */
-Lisp_Object Vtool_bar_style;
-/* Maximum number of characters a label can have to be shown.  */
-EMACS_INT tool_bar_max_label_size;
-/* Non-zero means draw block and hollow cursor as wide as the glyph
-under it.  For example, if a block cursor is over a tab, it will be
-drawn as wide as that tab on the display.  */
-int x_stretch_cursor_p;
 /* Non-nil means don't actually do any redisplay.  */
-Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay;
+Lisp_Object Qinhibit_redisplay;
-/* Non-zero means Lisp evaluation during redisplay is inhibited.  */
-int inhibit_eval_during_redisplay;
 /* Names of text properties relevant for redisplay.  */
 Lisp_Object Qdisplay;
-/* Symbols used in text property values.  */
-Lisp_Object Vdisplay_pixels_per_inch;
 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
 Lisp_Object Qslice;
 Lisp_Object Qcenter;
 Lisp_Object Qmargin, Qpointer;
 Lisp_Object Qline_height;
-/* Non-nil means highlight trailing whitespace.  */
-Lisp_Object Vshow_trailing_whitespace;
-/* Non-nil means escape non-break space and hyphens.  */
-Lisp_Object Vnobreak_char_display;
 #ifdef HAVE_WINDOW_SYSTEM
 /* Test if overflow newline into fringe.  Called with iterator IT
 at or past right window margin, and with IT->current_x set.  */
 /* Test if the display element loaded in IT is a space or tab
 character.  This is used to determine word wrapping.  */
 #define IT_DISPLAYING_WHITESPACE(it)				\
 (it->what == IT_CHARACTER && (it->c == ' ' || it->c == '\t'))
-/* Non-nil means show the text cursor in void text areas
-i.e. in blank areas after eol and eob.  This used to be
-the default in 21.3.  */
-Lisp_Object Vvoid_text_area_pointer;
 /* Name of the face used to highlight trailing whitespace.  */
 Lisp_Object Qtrailing_whitespace;
 /* Buffer that this_line_.* variables are referring to.  */
 static struct buffer *this_line_buffer;
-/* Nonzero means truncate lines in all windows less wide than the
-frame.  */
-Lisp_Object Vtruncate_partial_width_windows;
-/* A flag to control how to display unibyte 8-bit character.  */
-int unibyte_display_via_language_environment;
-/* Nonzero means we have more than one non-mini-buffer-only frame.
-Not guaranteed to be accurate except while parsing
-frame-title-format.  */
-int multiple_frames;
-Lisp_Object Vglobal_mode_string;
-/* List of variables (symbols) which hold markers for overlay arrows.
-The symbols on this list are examined during redisplay to determine
-where to display overlay arrows.  */
-Lisp_Object Voverlay_arrow_variable_list;
-/* Marker for where to display an arrow on top of the buffer text.  */
-Lisp_Object Voverlay_arrow_position;
-/* String to display for the arrow.  Only used on terminal frames.  */
-Lisp_Object Voverlay_arrow_string;
 /* Values of those variables at last redisplay are stored as
 properties on `overlay-arrow-position' symbol.  However, if
 Voverlay_arrow_position is a marker, last-arrow-position is its
 numerical position.  */
 /* Alternative overlay-arrow-string and overlay-arrow-bitmap
 properties on a symbol in overlay-arrow-variable-list.  */
 Lisp_Object Qoverlay_arrow_string, Qoverlay_arrow_bitmap;
-/* Like mode-line-format, but for the title bar on a visible frame.  */
+Lisp_Object Qmenu_bar_update_hook;
-Lisp_Object Vframe_title_format;
-/* Like mode-line-format, but for the title bar on an iconified frame.  */
-Lisp_Object Vicon_title_format;
-/* List of functions to call when a window's size changes.  These
-functions get one arg, a frame on which one or more windows' sizes
-have changed.  */
-static Lisp_Object Vwindow_size_change_functions;
-Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook;
 /* Nonzero if an overlay arrow has been displayed in this window.  */
 static int overlay_arrow_seen;
-/* Nonzero means highlight the region even in nonselected windows.  */
-int highlight_nonselected_windows;
-/* If cursor motion alone moves point off frame, try scrolling this
-many lines up or down if that will bring it back.  */
-static EMACS_INT emacs_scroll_step;
-/* Nonzero means scroll just far enough to bring point back on the
-screen, when appropriate.  */
-static EMACS_INT scroll_conservatively;
-/* Recenter the window whenever point gets within this many lines of
-the top or bottom of the window.  This value is translated into a
-pixel value by multiplying it with FRAME_LINE_HEIGHT, which means
-that there is really a fixed pixel height scroll margin.  */
-EMACS_INT scroll_margin;
 /* Number of windows showing the buffer of the selected window (or
 another buffer with the same base buffer).  keyboard.c refers to
 this.  */
 int buffer_shared;
 /* Vector containing glyphs for an ellipsis `...'.  */
 static Lisp_Object default_invis_vector[3];
-/* Zero means display the mode-line/header-line/menu-bar in the default face
-(this slightly odd definition is for compatibility with previous versions
-of emacs), non-zero means display them using their respective faces.
-This variable is deprecated.  */
-int mode_line_inverse_video;
 /* Prompt to display in front of the mini-buffer contents.  */
 Lisp_Object minibuf_prompt;
 /* Nonzero after display_mode_line if %l was used and it displayed a
 line number.  */
 int line_number_displayed;
-/* Maximum buffer size for which to display line numbers.  */
-Lisp_Object Vline_number_display_limit;
-/* Line width to consider when repositioning for line number display.  */
-static EMACS_INT line_number_display_limit_width;
-/* Number of lines to keep in the message log buffer.  t means
-infinite.  nil means don't log at all.  */
-Lisp_Object Vmessage_log_max;
 /* The name of the *Messages* buffer, a string.  */
 static Lisp_Object Vmessages_buffer_name;
 /* Current, index 0, and last displayed echo area message.  Either
 int message_buf_print;
 /* The symbol `inhibit-menubar-update' and its DEFVAR_BOOL variable.  */
 Lisp_Object Qinhibit_menubar_update;
-int inhibit_menubar_update;
-/* When evaluating expressions from menu bar items (enable conditions,
-for instance), this is the frame they are being processed for.  */
-Lisp_Object Vmenu_updating_frame;
-/* Maximum height for resizing mini-windows.  Either a float
-specifying a fraction of the available height, or an integer
-specifying a number of lines.  */
-Lisp_Object Vmax_mini_window_height;
-/* Non-zero means messages should be displayed with truncated
-lines instead of being continued.  */
-int message_truncate_lines;
 Lisp_Object Qmessage_truncate_lines;
 /* Set to 1 in clear_message to make redisplay_internal aware
 of an emptied echo area.  */
 static int message_cleared_p;
-/* How to blink the default frame cursor off.  */
-Lisp_Object Vblink_cursor_alist;
 /* A scratch glyph row with contents used for generating truncation
 glyphs.  Also used in direct_output_for_insert.  */
 #define MAX_SCRATCH_GLYPHS 100
 #define TEXT_PROP_DISTANCE_LIMIT 100
 #if GLYPH_DEBUG
-/* Variables to turn off display optimizations from Lisp.  */
-int inhibit_try_window_id, inhibit_try_window_reusing;
-int inhibit_try_cursor_movement;
 /* Non-zero means print traces of redisplay if compiled with
 GLYPH_DEBUG != 0.  */
 int trace_redisplay_p;
 #define TRACE_MOVE(x)	if (trace_move) fprintf x; else (void) 0
 #else
 #define TRACE_MOVE(x)	(void) 0
 #endif
-/* Non-zero means automatically scroll windows horizontally to make
-point visible.  */
-int automatic_hscrolling_p;
 Lisp_Object Qauto_hscroll_mode;
-/* How close to the margin can point get before the window is scrolled
-horizontally.  */
-EMACS_INT hscroll_margin;
-/* How much to scroll horizontally when point is inside the above margin.  */
-Lisp_Object Vhscroll_step;
-/* The variable `resize-mini-windows'.  If nil, don't resize
-mini-windows.  If t, always resize them to fit the text they
-display.  If `grow-only', let mini-windows grow only until they
-become empty.  */
-Lisp_Object Vresize_mini_windows;
 /* Buffer being redisplayed -- for redisplay_window_error.  */
 struct buffer *displayed_buffer;
-/* Space between overline and text. */
-EMACS_INT overline_margin;
-/* Require underline to be at least this many screen pixels below baseline
-This to avoid underline "merging" with the base of letters at small
-font sizes, particularly when x_use_underline_position_properties is on. */
-EMACS_INT underline_minimum_offset;
 /* Value returned from text property handlers (see below).  */
 enum prop_handled
 {
 /* Non-zero while redisplay_internal is in progress.  */
 int redisplaying_p;
-/* Non-zero means don't free realized faces.  Bound while freeing
-realized faces is dangerous because glyph matrices might still
-reference them.  */
-int inhibit_free_realized_faces;
 Lisp_Object Qinhibit_free_realized_faces;
 /* If a string, XTread_socket generates an event to display that string.
 (The display is done in read_char.)  */
 Lisp_Object previous_help_echo_string;
 /* Platform-independent portion of hourglass implementation. */
-/* Non-zero means we're allowed to display a hourglass pointer.  */
-int display_hourglass_p;
 /* Non-zero means an hourglass cursor is currently shown.  */
 int hourglass_shown_p;
 /* If non-null, an asynchronous timer that, when it expires, displays
 an hourglass cursor on all frames.  */
 struct atimer *hourglass_atimer;
-/* Number of seconds to wait before displaying an hourglass cursor.  */
-Lisp_Object Vhourglass_delay;
 /* Name of the face used to display glyphless characters.  */
 Lisp_Object Qglyphless_char;
-/* Char-table to control the display of glyphless characters.  */
-Lisp_Object Vglyphless_char_display;
 /* Symbol for the purpose of Vglyphless_char_display.  */
 Lisp_Object Qglyphless_char_display;
 /* Method symbols for Vglyphless_char_display.  */
 EMACS_INT debug_delta, debug_delta_bytes;
 /* Values of window_end_pos and window_end_vpos at the end of
 try_window_id.  */
-EMACS_INT debug_end_pos, debug_end_vpos;
+EMACS_INT debug_end_vpos;
 /* Append a string to W->desired_matrix->method.  FMT is a printf
 format string.  A1...A9 are a supplement for a variable-length
 argument list.  If trace_redisplay_p is non-zero also printf the
 resulting string to stderr.  */
 staticpro (&Qright_to_left);
 Qleft_to_right = intern_c_string ("left-to-right");
 staticpro (&Qleft_to_right);
 #ifdef HAVE_WINDOW_SYSTEM
-DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p,
+DEFVAR_BOOL ("x-stretch-cursor", x_stretch_cursor_p,
 doc: /* *Non-nil means draw block cursor as wide as the glyph under it.
 For example, if a block cursor is over a tab, it will be drawn as
 wide as that tab on the display.  */);
 x_stretch_cursor_p = 0;
 #endif
-DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace,
+DEFVAR_LISP ("show-trailing-whitespace", Vshow_trailing_whitespace,
 doc: /* *Non-nil means highlight trailing whitespace.
 The face used for trailing whitespace is `trailing-whitespace'.  */);
 Vshow_trailing_whitespace = Qnil;
-DEFVAR_LISP ("nobreak-char-display", &Vnobreak_char_display,
+DEFVAR_LISP ("nobreak-char-display", Vnobreak_char_display,
 doc: /* *Control highlighting of nobreak space and soft hyphen.
 A value of t means highlight the character itself (for nobreak space,
 use face `nobreak-space').
 A value of nil means no highlighting.
 Other values mean display the escape glyph followed by an ordinary
 space or ordinary hyphen.  */);
 Vnobreak_char_display = Qt;
-DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer,
+DEFVAR_LISP ("void-text-area-pointer", Vvoid_text_area_pointer,
 doc: /* *The pointer shape to show in void text areas.
 A value of nil means to show the text pointer.  Other options are `arrow',
 `text', `hand', `vdrag', `hdrag', `modeline', and `hourglass'.  */);
 Vvoid_text_area_pointer = Qarrow;
-DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay,
+DEFVAR_LISP ("inhibit-redisplay", Vinhibit_redisplay,
 doc: /* Non-nil means don't actually do any redisplay.
 This is used for internal purposes.  */);
 Vinhibit_redisplay = Qnil;
-DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
+DEFVAR_LISP ("global-mode-string", Vglobal_mode_string,
 doc: /* String (or mode line construct) included (normally) in `mode-line-format'.  */);
 Vglobal_mode_string = Qnil;
-DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
+DEFVAR_LISP ("overlay-arrow-position", Voverlay_arrow_position,
 doc: /* Marker for where to display an arrow on top of the buffer text.
 This must be the beginning of a line in order to work.
 See also `overlay-arrow-string'.  */);
 Voverlay_arrow_position = Qnil;
-DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
+DEFVAR_LISP ("overlay-arrow-string", Voverlay_arrow_string,
 doc: /* String to display as an arrow in non-window frames.
 See also `overlay-arrow-position'.  */);
 Voverlay_arrow_string = make_pure_c_string ("=>");
-DEFVAR_LISP ("overlay-arrow-variable-list", &Voverlay_arrow_variable_list,
+DEFVAR_LISP ("overlay-arrow-variable-list", Voverlay_arrow_variable_list,
 doc: /* List of variables (symbols) which hold markers for overlay arrows.
 The symbols on this list are examined during redisplay to determine
 where to display overlay arrows.  */);
 Voverlay_arrow_variable_list
 = Fcons (intern_c_string ("overlay-arrow-position"), Qnil);
-DEFVAR_INT ("scroll-step", &emacs_scroll_step,
+DEFVAR_INT ("scroll-step", emacs_scroll_step,
 doc: /* *The number of lines to try scrolling a window by when point moves out.
 If that fails to bring point back on frame, point is centered instead.
 If this is zero, point is always centered after it moves off frame.
 If you want scrolling to always be a line at a time, you should set
 `scroll-conservatively' to a large value rather than set this to 1.  */);
-DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
+DEFVAR_INT ("scroll-conservatively", scroll_conservatively,
 doc: /* *Scroll up to this many lines, to bring point back on screen.
 If point moves off-screen, redisplay will scroll by up to
 `scroll-conservatively' lines in order to bring point just barely
 onto the screen again.  If that cannot be done, then redisplay
 recenters point as usual.
 A value of zero means always recenter point if it moves off screen.  */);
 scroll_conservatively = 0;
-DEFVAR_INT ("scroll-margin", &scroll_margin,
+DEFVAR_INT ("scroll-margin", scroll_margin,
 doc: /* *Number of lines of margin at the top and bottom of a window.
 Recenter the window whenever point gets within this many lines
 of the top or bottom of the window.  */);
 scroll_margin = 0;
-DEFVAR_LISP ("display-pixels-per-inch",  &Vdisplay_pixels_per_inch,
+DEFVAR_LISP ("display-pixels-per-inch",  Vdisplay_pixels_per_inch,
 doc: /* Pixels per inch value for non-window system displays.
 Value is a number or a cons (WIDTH-DPI . HEIGHT-DPI).  */);
 Vdisplay_pixels_per_inch = make_float (72.0);
 #if GLYPH_DEBUG
-DEFVAR_INT ("debug-end-pos", &debug_end_pos, doc: /* Don't ask.  */);
+DEFVAR_INT ("debug-end-pos", debug_end_pos, doc: /* Don't ask.  */);
 #endif
 DEFVAR_LISP ("truncate-partial-width-windows",
-	       &Vtruncate_partial_width_windows,
+	       Vtruncate_partial_width_windows,
 doc: /* Non-nil means truncate lines in windows narrower than the frame.
 For an integer value, truncate lines in each window narrower than the
 full frame width, provided the window width is less than that integer;
 otherwise, respect the value of `truncate-lines'.
 A value of nil means to respect the value of `truncate-lines'.
 If `word-wrap' is enabled, you might want to reduce this.  */);
 Vtruncate_partial_width_windows = make_number (50);
-DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
+DEFVAR_BOOL ("mode-line-inverse-video", mode_line_inverse_video,
 doc: /* When nil, display the mode-line/header-line/menu-bar in the default face.
 Any other value means to use the appropriate face, `mode-line',
 `header-line', or `menu' respectively.  */);
 mode_line_inverse_video = 1;
-DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit,
+DEFVAR_LISP ("line-number-display-limit", Vline_number_display_limit,
 doc: /* *Maximum buffer size for which line number should be displayed.
 If the buffer is bigger than this, the line number does not appear
 in the mode line.  A value of nil means no limit.  */);
 Vline_number_display_limit = Qnil;
 DEFVAR_INT ("line-number-display-limit-width",
-	      &line_number_display_limit_width,
+	      line_number_display_limit_width,
 doc: /* *Maximum line width (in characters) for line number display.
 If the average length of the lines near point is bigger than this, then the
 line number may be omitted from the mode line.  */);
 line_number_display_limit_width = 200;
-DEFVAR_BOOL ("highlight-nonselected-windows", &highlight_nonselected_windows,
+DEFVAR_BOOL ("highlight-nonselected-windows", highlight_nonselected_windows,
 doc: /* *Non-nil means highlight region even in nonselected windows.  */);
 highlight_nonselected_windows = 0;
-DEFVAR_BOOL ("multiple-frames", &multiple_frames,
+DEFVAR_BOOL ("multiple-frames", multiple_frames,
 doc: /* Non-nil if more than one frame is visible on this display.
 Minibuffer-only frames don't count, but iconified frames do.
 This variable is not guaranteed to be accurate except while processing
 `frame-title-format' and `icon-title-format'.  */);
-DEFVAR_LISP ("frame-title-format", &Vframe_title_format,
+DEFVAR_LISP ("frame-title-format", Vframe_title_format,
 doc: /* Template for displaying the title bar of visible frames.
 \(Assuming the window manager supports this feature.)
 This variable has the same structure as `mode-line-format', except that
 the %c and %l constructs are ignored.  It is used only on frames for
 which no explicit name has been set \(see `modify-frame-parameters').  */);
-DEFVAR_LISP ("icon-title-format", &Vicon_title_format,
+DEFVAR_LISP ("icon-title-format", Vicon_title_format,
 doc: /* Template for displaying the title bar of an iconified frame.
 \(Assuming the window manager supports this feature.)
 This variable has the same structure as `mode-line-format' (which see),
 and is used only on frames for which no explicit name has been set
 \(see `modify-frame-parameters').  */);
 							     pure_cons (make_pure_c_string ("@"),
 									pure_cons (intern_c_string ("system-name"),
 										   Qnil)))),
 				       Qnil)));
-DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
+DEFVAR_LISP ("message-log-max", Vmessage_log_max,
 doc: /* Maximum number of lines to keep in the message log buffer.
 If nil, disable message logging.  If t, log messages but don't truncate
 the buffer when it becomes large.  */);
 Vmessage_log_max = make_number (100);
-DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions,
+DEFVAR_LISP ("window-size-change-functions", Vwindow_size_change_functions,
 doc: /* Functions called before redisplay, if window sizes have changed.
 The value should be a list of functions that take one argument.
 Just before redisplay, for each frame, if any of its windows have changed
 size since the last redisplay, or have been split or deleted,
 all the functions in the list are called, with the frame as argument.  */);
 Vwindow_size_change_functions = Qnil;
-DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
+DEFVAR_LISP ("window-scroll-functions", Vwindow_scroll_functions,
 doc: /* List of functions to call before redisplaying a window with scrolling.
 Each function is called with two arguments, the window and its new
 display-start position.  Note that these functions are also called by
 `set-window-buffer'.  Also note that the value of `window-end' is not
 valid when these functions are called.  */);
 Vwindow_scroll_functions = Qnil;
 DEFVAR_LISP ("window-text-change-functions",
-	       &Vwindow_text_change_functions,
+	       Vwindow_text_change_functions,
 doc: /* Functions to call in redisplay when text in the window might change.  */);
 Vwindow_text_change_functions = Qnil;
-DEFVAR_LISP ("redisplay-end-trigger-functions", &Vredisplay_end_trigger_functions,
+DEFVAR_LISP ("redisplay-end-trigger-functions", Vredisplay_end_trigger_functions,
 doc: /* Functions called when redisplay of a window reaches the end trigger.
 Each function is called with two arguments, the window and the end trigger value.
 See `set-window-redisplay-end-trigger'.  */);
 Vredisplay_end_trigger_functions = Qnil;
-DEFVAR_LISP ("mouse-autoselect-window", &Vmouse_autoselect_window,
+DEFVAR_LISP ("mouse-autoselect-window", Vmouse_autoselect_window,
 doc: /* *Non-nil means autoselect window with mouse pointer.
 If nil, do not autoselect windows.
 A positive number means delay autoselection by that many seconds: a
 window is autoselected only after the mouse has remained in that
 window for the duration of the delay.
 When customizing this variable make sure that the actual value of
 `focus-follows-mouse' matches the behavior of your window manager.  */);
 Vmouse_autoselect_window = Qnil;
-DEFVAR_LISP ("auto-resize-tool-bars", &Vauto_resize_tool_bars,
+DEFVAR_LISP ("auto-resize-tool-bars", Vauto_resize_tool_bars,
 doc: /* *Non-nil means automatically resize tool-bars.
 This dynamically changes the tool-bar's height to the minimum height
 that is needed to make all tool-bar items visible.
 If value is `grow-only', the tool-bar's height is only increased
 automatically; to decrease the tool-bar height, use \\[recenter].  */);
 Vauto_resize_tool_bars = Qt;
-DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p,
+DEFVAR_BOOL ("auto-raise-tool-bar-buttons", auto_raise_tool_bar_buttons_p,
 doc: /* *Non-nil means raise tool-bar buttons when the mouse moves over them.  */);
 auto_raise_tool_bar_buttons_p = 1;
-DEFVAR_BOOL ("make-cursor-line-fully-visible", &make_cursor_line_fully_visible_p,
+DEFVAR_BOOL ("make-cursor-line-fully-visible", make_cursor_line_fully_visible_p,
 doc: /* *Non-nil means to scroll (recenter) cursor line if it is not fully visible.  */);
 make_cursor_line_fully_visible_p = 1;
-DEFVAR_LISP ("tool-bar-border", &Vtool_bar_border,
+DEFVAR_LISP ("tool-bar-border", Vtool_bar_border,
 doc: /* *Border below tool-bar in pixels.
 If an integer, use it as the height of the border.
 If it is one of `internal-border-width' or `border-width', use the
 value of the corresponding frame parameter.
 Otherwise, no border is added below the tool-bar.  */);
 Vtool_bar_border = Qinternal_border_width;
-DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin,
+DEFVAR_LISP ("tool-bar-button-margin", Vtool_bar_button_margin,
 doc: /* *Margin around tool-bar buttons in pixels.
 If an integer, use that for both horizontal and vertical margins.
 Otherwise, value should be a pair of integers `(HORZ . VERT)' with
 HORZ specifying the horizontal margin, and VERT specifying the
 vertical margin.  */);
 Vtool_bar_button_margin = make_number (DEFAULT_TOOL_BAR_BUTTON_MARGIN);
-DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief,
+DEFVAR_INT ("tool-bar-button-relief", tool_bar_button_relief,
 doc: /* *Relief thickness of tool-bar buttons.  */);
 tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF;
-DEFVAR_LISP ("tool-bar-style", &Vtool_bar_style,
+DEFVAR_LISP ("tool-bar-style", Vtool_bar_style,
 doc: /* Tool bar style to use.
 It can be one of
 image            - show images only
 text             - show text only
 both             - show both, text below image
 both-horiz       - show text to the right of the image
 text-image-horiz - show text to the left of the image
 any other        - use system default or image if no system default.  */);
 Vtool_bar_style = Qnil;
-DEFVAR_INT ("tool-bar-max-label-size", &tool_bar_max_label_size,
+DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size,
 doc: /* *Maximum number of characters a label can have to be shown.
 The tool bar style must also show labels for this to have any effect, see
 `tool-bar-style'.  */);
 tool_bar_max_label_size = DEFAULT_TOOL_BAR_LABEL_SIZE;
-DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
+DEFVAR_LISP ("fontification-functions", Vfontification_functions,
 doc: /* List of functions to call to fontify regions of text.
 Each function is called with one argument POS.  Functions must
 fontify a region starting at POS in the current buffer, and give
 fontified regions the property `fontified'.  */);
 Vfontification_functions = Qnil;
 Fmake_variable_buffer_local (Qfontification_functions);
 DEFVAR_BOOL ("unibyte-display-via-language-environment",
-&unibyte_display_via_language_environment,
+unibyte_display_via_language_environment,
 doc: /* *Non-nil means display unibyte text according to language environment.
 Specifically, this means that raw bytes in the range 160-255 decimal
 are displayed by converting them to the equivalent multibyte characters
 according to the current language environment.  As a result, they are
 displayed according to the current fontset.
 Note that this variable affects only how these bytes are displayed,
 but does not change the fact they are interpreted as raw bytes.  */);
 unibyte_display_via_language_environment = 0;
-DEFVAR_LISP ("max-mini-window-height", &Vmax_mini_window_height,
+DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height,
 doc: /* *Maximum height for resizing mini-windows.
 If a float, it specifies a fraction of the mini-window frame's height.
 If an integer, it specifies a number of lines.  */);
 Vmax_mini_window_height = make_float (0.25);
-DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows,
+DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows,
 doc: /* *How to resize mini-windows.
 A value of nil means don't automatically resize mini-windows.
 A value of t means resize them to fit the text displayed in them.
 A value of `grow-only', the default, means let mini-windows grow
 only, until their display becomes empty, at which point the windows
 go back to their normal size.  */);
 Vresize_mini_windows = Qgrow_only;
-DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
+DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,
 doc: /* Alist specifying how to blink the cursor off.
 Each element has the form (ON-STATE . OFF-STATE).  Whenever the
 `cursor-type' frame-parameter or variable equals ON-STATE,
 comparing using `equal', Emacs uses OFF-STATE to specify
 how to blink it off.  ON-STATE and OFF-STATE are values for
 If a frame's ON-STATE has no entry in this list,
 the frame's other specifications determine how to blink the cursor off.  */);
 Vblink_cursor_alist = Qnil;
-DEFVAR_BOOL ("auto-hscroll-mode", &automatic_hscrolling_p,
+DEFVAR_BOOL ("auto-hscroll-mode", automatic_hscrolling_p,
 doc: /* Allow or disallow automatic horizontal scrolling of windows.
 If non-nil, windows are automatically scrolled horizontally to make
 point visible.  */);
 automatic_hscrolling_p = 1;
 Qauto_hscroll_mode = intern_c_string ("auto-hscroll-mode");
 staticpro (&Qauto_hscroll_mode);
-DEFVAR_INT ("hscroll-margin", &hscroll_margin,
+DEFVAR_INT ("hscroll-margin", hscroll_margin,
 doc: /* *How many columns away from the window edge point is allowed to get
 before automatic hscrolling will horizontally scroll the window.  */);
 hscroll_margin = 5;
-DEFVAR_LISP ("hscroll-step", &Vhscroll_step,
+DEFVAR_LISP ("hscroll-step", Vhscroll_step,
 doc: /* *How many columns to scroll the window when point gets too close to the edge.
 When point is less than `hscroll-margin' columns from the window
 edge, automatic hscrolling will scroll the window by the amount of columns
 determined by this variable.  If its value is a positive integer, scroll that
 many columns.  If it's a positive floating-point number, it specifies the
 Note that the lower bound for automatic hscrolling specified by `scroll-left'
 and `scroll-right' overrides this variable's effect.  */);
 Vhscroll_step = make_number (0);
-DEFVAR_BOOL ("message-truncate-lines", &message_truncate_lines,
+DEFVAR_BOOL ("message-truncate-lines", message_truncate_lines,
 doc: /* If non-nil, messages are truncated instead of resizing the echo area.
 Bind this around calls to `message' to let it take effect.  */);
 message_truncate_lines = 0;
-DEFVAR_LISP ("menu-bar-update-hook",  &Vmenu_bar_update_hook,
+DEFVAR_LISP ("menu-bar-update-hook",  Vmenu_bar_update_hook,
 doc: /* Normal hook run to update the menu bar definitions.
 Redisplay runs this hook before it redisplays the menu bar.
 This is used to update submenus such as Buffers,
 whose contents depend on various data.  */);
 Vmenu_bar_update_hook = Qnil;
-DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame,
+DEFVAR_LISP ("menu-updating-frame", Vmenu_updating_frame,
 	       doc: /* Frame for which we are updating a menu.
 The enable predicate for a menu binding should check this variable.  */);
 Vmenu_updating_frame = Qnil;
-DEFVAR_BOOL ("inhibit-menubar-update", &inhibit_menubar_update,
+DEFVAR_BOOL ("inhibit-menubar-update", inhibit_menubar_update,
 doc: /* Non-nil means don't update menu bars.  Internal use only.  */);
 inhibit_menubar_update = 0;
-DEFVAR_LISP ("wrap-prefix", &Vwrap_prefix,
+DEFVAR_LISP ("wrap-prefix", Vwrap_prefix,
 doc: /* Prefix prepended to all continuation lines at display time.
 The value may be a string, an image, or a stretch-glyph; it is
 interpreted in the same way as the value of a `display' text property.
 This variable is overridden by any `wrap-prefix' text or overlay
 Vwrap_prefix = Qnil;
 staticpro (&Qwrap_prefix);
 Qwrap_prefix = intern_c_string ("wrap-prefix");
 Fmake_variable_buffer_local (Qwrap_prefix);
-DEFVAR_LISP ("line-prefix", &Vline_prefix,
+DEFVAR_LISP ("line-prefix", Vline_prefix,
 doc: /* Prefix prepended to all non-continuation lines at display time.
 The value may be a string, an image, or a stretch-glyph; it is
 interpreted in the same way as the value of a `display' text property.
 This variable is overridden by any `line-prefix' text or overlay
 Vline_prefix = Qnil;
 staticpro (&Qline_prefix);
 Qline_prefix = intern_c_string ("line-prefix");
 Fmake_variable_buffer_local (Qline_prefix);
-DEFVAR_BOOL ("inhibit-eval-during-redisplay", &inhibit_eval_during_redisplay,
+DEFVAR_BOOL ("inhibit-eval-during-redisplay", inhibit_eval_during_redisplay,
 doc: /* Non-nil means don't eval Lisp during redisplay.  */);
 inhibit_eval_during_redisplay = 0;
-DEFVAR_BOOL ("inhibit-free-realized-faces", &inhibit_free_realized_faces,
+DEFVAR_BOOL ("inhibit-free-realized-faces", inhibit_free_realized_faces,
 doc: /* Non-nil means don't free realized faces.  Internal use only.  */);
 inhibit_free_realized_faces = 0;
 #if GLYPH_DEBUG
-DEFVAR_BOOL ("inhibit-try-window-id", &inhibit_try_window_id,
+DEFVAR_BOOL ("inhibit-try-window-id", inhibit_try_window_id,
 	       doc: /* Inhibit try_window_id display optimization.  */);
 inhibit_try_window_id = 0;
-DEFVAR_BOOL ("inhibit-try-window-reusing", &inhibit_try_window_reusing,
+DEFVAR_BOOL ("inhibit-try-window-reusing", inhibit_try_window_reusing,
 	       doc: /* Inhibit try_window_reusing display optimization.  */);
 inhibit_try_window_reusing = 0;
-DEFVAR_BOOL ("inhibit-try-cursor-movement", &inhibit_try_cursor_movement,
+DEFVAR_BOOL ("inhibit-try-cursor-movement", inhibit_try_cursor_movement,
 	       doc: /* Inhibit try_cursor_movement display optimization.  */);
 inhibit_try_cursor_movement = 0;
 #endif /* GLYPH_DEBUG */
-DEFVAR_INT ("overline-margin", &overline_margin,
+DEFVAR_INT ("overline-margin", overline_margin,
 	       doc: /* *Space between overline and text, in pixels.
 The default value is 2: the height of the overline (1 pixel) plus 1 pixel
 margin to the caracter height.  */);
 overline_margin = 2;
 DEFVAR_INT ("underline-minimum-offset",
-	       &underline_minimum_offset,
+	       underline_minimum_offset,
 doc: /* Minimum distance between baseline and underline.
 This can improve legibility of underlined text at small font sizes,
 particularly when using variable `x-use-underline-position-properties'
 with fonts that specify an UNDERLINE_POSITION relatively close to the
 baseline.  The default value is 1.  */);
 underline_minimum_offset = 1;
-DEFVAR_BOOL ("display-hourglass", &display_hourglass_p,
+DEFVAR_BOOL ("display-hourglass", display_hourglass_p,
 	       doc: /* Non-nil means show an hourglass pointer, when Emacs is busy.
 This feature only works when on a window system that can change
 cursor shapes.  */);
 display_hourglass_p = 1;
-DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay,
+DEFVAR_LISP ("hourglass-delay", Vhourglass_delay,
 	       doc: /* *Seconds to wait before displaying an hourglass pointer when Emacs is busy.  */);
 Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY);
 hourglass_atimer = NULL;
 hourglass_shown_p = 0;
 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");
 Fput (Qglyphless_char_display, Qchar_table_extra_slots, make_number (1));
-DEFVAR_LISP ("glyphless-char-display", &Vglyphless_char_display,
+DEFVAR_LISP ("glyphless-char-display", Vglyphless_char_display,
 	       doc: /* Char-table to control displaying of glyphless characters.
 Each element, if non-nil, is an ASCII acronym string (displayed in a box)
 or one of these symbols:
 hex-code:   display the hexadecimal code of a character in a box
 empty-box:  display as an empty box

Mercurial > emacs

comparison src/xdisp.c @ 112364:42e22c4f06b7