Mercurial > emacs
comparison src/xfns.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 | 28ca83ef1128 |
children | 9de5a68b57e1 |
comparison
equal
deleted
inserted
replaced
112363:6a0c66185ba1 | 112364:42e22c4f06b7 |
---|---|
117 extern void free_frame_menubar (); | 117 extern void free_frame_menubar (); |
118 extern double atof (); | 118 extern double atof (); |
119 | 119 |
120 #ifdef USE_MOTIF | 120 #ifdef USE_MOTIF |
121 | 121 |
122 /* LessTif/Motif version info. */ | |
123 | |
124 static Lisp_Object Vmotif_version_string; | |
125 | |
126 #endif /* USE_MOTIF */ | 122 #endif /* USE_MOTIF */ |
127 | 123 |
128 #endif /* USE_X_TOOLKIT */ | 124 #endif /* USE_X_TOOLKIT */ |
129 | 125 |
130 #ifdef USE_GTK | 126 #ifdef USE_GTK |
131 | |
132 /* GTK+ version info */ | |
133 | |
134 static Lisp_Object Vgtk_version_string; | |
135 | 127 |
136 #endif /* USE_GTK */ | 128 #endif /* USE_GTK */ |
137 | 129 |
138 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) | 130 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) |
139 | 131 |
143 | 135 |
144 int gray_bitmap_width = gray_width; | 136 int gray_bitmap_width = gray_width; |
145 int gray_bitmap_height = gray_height; | 137 int gray_bitmap_height = gray_height; |
146 char *gray_bitmap_bits = gray_bits; | 138 char *gray_bitmap_bits = gray_bits; |
147 | 139 |
148 /* Non-zero means prompt with the old GTK file selection dialog. */ | |
149 | |
150 int x_gtk_use_old_file_dialog; | |
151 | |
152 /* If non-zero, by default show hidden files in the GTK file chooser. */ | |
153 | |
154 int x_gtk_show_hidden_files; | |
155 | |
156 /* If non-zero, don't show additional help text in the GTK file chooser. */ | |
157 | |
158 int x_gtk_file_dialog_help_text; | |
159 | |
160 /* If non-zero, don't collapse to tool bar when it is detached. */ | |
161 | |
162 int x_gtk_whole_detached_tool_bar; | |
163 | |
164 /* If non-zero, use Gtk+ tooltips. */ | |
165 | |
166 static int x_gtk_use_system_tooltips; | |
167 | |
168 /* The background and shape of the mouse pointer, and shape when not | |
169 over text or in the modeline. */ | |
170 | |
171 Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape; | |
172 Lisp_Object Vx_hourglass_pointer_shape; | |
173 | |
174 /* The shape when over mouse-sensitive text. */ | |
175 | |
176 Lisp_Object Vx_sensitive_text_pointer_shape; | |
177 | |
178 /* If non-nil, the pointer shape to indicate that windows can be | |
179 dragged horizontally. */ | |
180 | |
181 Lisp_Object Vx_window_horizontal_drag_shape; | |
182 | |
183 /* Color of chars displayed in cursor box. */ | |
184 | |
185 Lisp_Object Vx_cursor_fore_pixel; | |
186 | |
187 /* Nonzero if using X. */ | 140 /* Nonzero if using X. */ |
188 | 141 |
189 static int x_in_use; | 142 static int x_in_use; |
190 | |
191 /* Non nil if no window manager is in use. */ | |
192 | |
193 Lisp_Object Vx_no_window_manager; | |
194 | |
195 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ | |
196 | |
197 Lisp_Object Vx_pixel_size_width_font_regexp; | |
198 | 143 |
199 Lisp_Object Qnone; | 144 Lisp_Object Qnone; |
200 Lisp_Object Qsuppress_icon; | 145 Lisp_Object Qsuppress_icon; |
201 Lisp_Object Qundefined_color; | 146 Lisp_Object Qundefined_color; |
202 Lisp_Object Qcompound_text, Qcancel_timer; | 147 Lisp_Object Qcompound_text, Qcancel_timer; |
4600 /* If non-nil, a vector of 3 elements containing the last args | 4545 /* If non-nil, a vector of 3 elements containing the last args |
4601 with which x-show-tip was called. See there. */ | 4546 with which x-show-tip was called. See there. */ |
4602 | 4547 |
4603 Lisp_Object last_show_tip_args; | 4548 Lisp_Object last_show_tip_args; |
4604 | 4549 |
4605 /* Maximum size for tooltips; a cons (COLUMNS . ROWS). */ | |
4606 | |
4607 Lisp_Object Vx_max_tooltip_size; | |
4608 | |
4609 | 4550 |
4610 static Lisp_Object | 4551 static Lisp_Object |
4611 unwind_create_tip_frame (Lisp_Object frame) | 4552 unwind_create_tip_frame (Lisp_Object frame) |
4612 { | 4553 { |
4613 Lisp_Object deleted; | 4554 Lisp_Object deleted; |
5910 Fput (Qundefined_color, Qerror_conditions, | 5851 Fput (Qundefined_color, Qerror_conditions, |
5911 pure_cons (Qundefined_color, pure_cons (Qerror, Qnil))); | 5852 pure_cons (Qundefined_color, pure_cons (Qerror, Qnil))); |
5912 Fput (Qundefined_color, Qerror_message, | 5853 Fput (Qundefined_color, Qerror_message, |
5913 make_pure_c_string ("Undefined color")); | 5854 make_pure_c_string ("Undefined color")); |
5914 | 5855 |
5915 DEFVAR_LISP ("x-pointer-shape", &Vx_pointer_shape, | 5856 DEFVAR_LISP ("x-pointer-shape", Vx_pointer_shape, |
5916 doc: /* The shape of the pointer when over text. | 5857 doc: /* The shape of the pointer when over text. |
5917 Changing the value does not affect existing frames | 5858 Changing the value does not affect existing frames |
5918 unless you set the mouse color. */); | 5859 unless you set the mouse color. */); |
5919 Vx_pointer_shape = Qnil; | 5860 Vx_pointer_shape = Qnil; |
5920 | 5861 |
5921 #if 0 /* This doesn't really do anything. */ | 5862 #if 0 /* This doesn't really do anything. */ |
5922 DEFVAR_LISP ("x-nontext-pointer-shape", &Vx_nontext_pointer_shape, | 5863 DEFVAR_LISP ("x-nontext-pointer-shape", Vx_nontext_pointer_shape, |
5923 doc: /* The shape of the pointer when not over text. | 5864 doc: /* The shape of the pointer when not over text. |
5924 This variable takes effect when you create a new frame | 5865 This variable takes effect when you create a new frame |
5925 or when you set the mouse color. */); | 5866 or when you set the mouse color. */); |
5926 #endif | 5867 #endif |
5927 Vx_nontext_pointer_shape = Qnil; | 5868 Vx_nontext_pointer_shape = Qnil; |
5928 | 5869 |
5929 DEFVAR_LISP ("x-hourglass-pointer-shape", &Vx_hourglass_pointer_shape, | 5870 DEFVAR_LISP ("x-hourglass-pointer-shape", Vx_hourglass_pointer_shape, |
5930 doc: /* The shape of the pointer when Emacs is busy. | 5871 doc: /* The shape of the pointer when Emacs is busy. |
5931 This variable takes effect when you create a new frame | 5872 This variable takes effect when you create a new frame |
5932 or when you set the mouse color. */); | 5873 or when you set the mouse color. */); |
5933 Vx_hourglass_pointer_shape = Qnil; | 5874 Vx_hourglass_pointer_shape = Qnil; |
5934 | 5875 |
5935 #if 0 /* This doesn't really do anything. */ | 5876 #if 0 /* This doesn't really do anything. */ |
5936 DEFVAR_LISP ("x-mode-pointer-shape", &Vx_mode_pointer_shape, | 5877 DEFVAR_LISP ("x-mode-pointer-shape", Vx_mode_pointer_shape, |
5937 doc: /* The shape of the pointer when over the mode line. | 5878 doc: /* The shape of the pointer when over the mode line. |
5938 This variable takes effect when you create a new frame | 5879 This variable takes effect when you create a new frame |
5939 or when you set the mouse color. */); | 5880 or when you set the mouse color. */); |
5940 #endif | 5881 #endif |
5941 Vx_mode_pointer_shape = Qnil; | 5882 Vx_mode_pointer_shape = Qnil; |
5942 | 5883 |
5943 DEFVAR_LISP ("x-sensitive-text-pointer-shape", | 5884 DEFVAR_LISP ("x-sensitive-text-pointer-shape", |
5944 &Vx_sensitive_text_pointer_shape, | 5885 Vx_sensitive_text_pointer_shape, |
5945 doc: /* The shape of the pointer when over mouse-sensitive text. | 5886 doc: /* The shape of the pointer when over mouse-sensitive text. |
5946 This variable takes effect when you create a new frame | 5887 This variable takes effect when you create a new frame |
5947 or when you set the mouse color. */); | 5888 or when you set the mouse color. */); |
5948 Vx_sensitive_text_pointer_shape = Qnil; | 5889 Vx_sensitive_text_pointer_shape = Qnil; |
5949 | 5890 |
5950 DEFVAR_LISP ("x-window-horizontal-drag-cursor", | 5891 DEFVAR_LISP ("x-window-horizontal-drag-cursor", |
5951 &Vx_window_horizontal_drag_shape, | 5892 Vx_window_horizontal_drag_shape, |
5952 doc: /* Pointer shape to use for indicating a window can be dragged horizontally. | 5893 doc: /* Pointer shape to use for indicating a window can be dragged horizontally. |
5953 This variable takes effect when you create a new frame | 5894 This variable takes effect when you create a new frame |
5954 or when you set the mouse color. */); | 5895 or when you set the mouse color. */); |
5955 Vx_window_horizontal_drag_shape = Qnil; | 5896 Vx_window_horizontal_drag_shape = Qnil; |
5956 | 5897 |
5957 DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel, | 5898 DEFVAR_LISP ("x-cursor-fore-pixel", Vx_cursor_fore_pixel, |
5958 doc: /* A string indicating the foreground color of the cursor box. */); | 5899 doc: /* A string indicating the foreground color of the cursor box. */); |
5959 Vx_cursor_fore_pixel = Qnil; | 5900 Vx_cursor_fore_pixel = Qnil; |
5960 | 5901 |
5961 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size, | 5902 DEFVAR_LISP ("x-max-tooltip-size", Vx_max_tooltip_size, |
5962 doc: /* Maximum size for tooltips. | 5903 doc: /* Maximum size for tooltips. |
5963 Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */); | 5904 Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */); |
5964 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); | 5905 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); |
5965 | 5906 |
5966 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager, | 5907 DEFVAR_LISP ("x-no-window-manager", Vx_no_window_manager, |
5967 doc: /* Non-nil if no X window manager is in use. | 5908 doc: /* Non-nil if no X window manager is in use. |
5968 Emacs doesn't try to figure this out; this is always nil | 5909 Emacs doesn't try to figure this out; this is always nil |
5969 unless you set it to something else. */); | 5910 unless you set it to something else. */); |
5970 /* We don't have any way to find this out, so set it to nil | 5911 /* We don't have any way to find this out, so set it to nil |
5971 and maybe the user would like to set it to t. */ | 5912 and maybe the user would like to set it to t. */ |
5972 Vx_no_window_manager = Qnil; | 5913 Vx_no_window_manager = Qnil; |
5973 | 5914 |
5974 DEFVAR_LISP ("x-pixel-size-width-font-regexp", | 5915 DEFVAR_LISP ("x-pixel-size-width-font-regexp", |
5975 &Vx_pixel_size_width_font_regexp, | 5916 Vx_pixel_size_width_font_regexp, |
5976 doc: /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. | 5917 doc: /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. |
5977 | 5918 |
5978 Since Emacs gets width of a font matching with this regexp from | 5919 Since Emacs gets width of a font matching with this regexp from |
5979 PIXEL_SIZE field of the name, font finding mechanism gets faster for | 5920 PIXEL_SIZE field of the name, font finding mechanism gets faster for |
5980 such a font. This is especially effective for such large fonts as | 5921 such a font. This is especially effective for such large fonts as |
5981 Chinese, Japanese, and Korean. */); | 5922 Chinese, Japanese, and Korean. */); |
5982 Vx_pixel_size_width_font_regexp = Qnil; | 5923 Vx_pixel_size_width_font_regexp = Qnil; |
5983 | 5924 |
5984 /* This is not ifdef:ed, so other builds than GTK can customize it. */ | 5925 /* This is not ifdef:ed, so other builds than GTK can customize it. */ |
5985 DEFVAR_BOOL ("x-gtk-use-old-file-dialog", &x_gtk_use_old_file_dialog, | 5926 DEFVAR_BOOL ("x-gtk-use-old-file-dialog", x_gtk_use_old_file_dialog, |
5986 doc: /* *Non-nil means prompt with the old GTK file selection dialog. | 5927 doc: /* *Non-nil means prompt with the old GTK file selection dialog. |
5987 If nil or if the file selection dialog is not available, the new GTK file | 5928 If nil or if the file selection dialog is not available, the new GTK file |
5988 chooser is used instead. To turn off all file dialogs set the | 5929 chooser is used instead. To turn off all file dialogs set the |
5989 variable `use-file-dialog'. */); | 5930 variable `use-file-dialog'. */); |
5990 x_gtk_use_old_file_dialog = 0; | 5931 x_gtk_use_old_file_dialog = 0; |
5991 | 5932 |
5992 DEFVAR_BOOL ("x-gtk-show-hidden-files", &x_gtk_show_hidden_files, | 5933 DEFVAR_BOOL ("x-gtk-show-hidden-files", x_gtk_show_hidden_files, |
5993 doc: /* *If non-nil, the GTK file chooser will by default show hidden files. | 5934 doc: /* *If non-nil, the GTK file chooser will by default show hidden files. |
5994 Note that this is just the default, there is a toggle button on the file | 5935 Note that this is just the default, there is a toggle button on the file |
5995 chooser to show or not show hidden files on a case by case basis. */); | 5936 chooser to show or not show hidden files on a case by case basis. */); |
5996 x_gtk_show_hidden_files = 0; | 5937 x_gtk_show_hidden_files = 0; |
5997 | 5938 |
5998 DEFVAR_BOOL ("x-gtk-file-dialog-help-text", &x_gtk_file_dialog_help_text, | 5939 DEFVAR_BOOL ("x-gtk-file-dialog-help-text", x_gtk_file_dialog_help_text, |
5999 doc: /* *If non-nil, the GTK file chooser will show additional help text. | 5940 doc: /* *If non-nil, the GTK file chooser will show additional help text. |
6000 If more space for files in the file chooser dialog is wanted, set this to nil | 5941 If more space for files in the file chooser dialog is wanted, set this to nil |
6001 to turn the additional text off. */); | 5942 to turn the additional text off. */); |
6002 x_gtk_file_dialog_help_text = 1; | 5943 x_gtk_file_dialog_help_text = 1; |
6003 | 5944 |
6004 DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", &x_gtk_whole_detached_tool_bar, | 5945 DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", x_gtk_whole_detached_tool_bar, |
6005 doc: /* *If non-nil, a detached tool bar is shown in full. | 5946 doc: /* *If non-nil, a detached tool bar is shown in full. |
6006 The default is to just show an arrow and pressing on that arrow shows | 5947 The default is to just show an arrow and pressing on that arrow shows |
6007 the tool bar buttons. */); | 5948 the tool bar buttons. */); |
6008 x_gtk_whole_detached_tool_bar = 0; | 5949 x_gtk_whole_detached_tool_bar = 0; |
6009 | 5950 |
6010 DEFVAR_BOOL ("x-gtk-use-system-tooltips", &x_gtk_use_system_tooltips, | 5951 DEFVAR_BOOL ("x-gtk-use-system-tooltips", x_gtk_use_system_tooltips, |
6011 doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ toolip is used. | 5952 doc: /* *If non-nil with a Gtk+ built Emacs, the Gtk+ toolip is used. |
6012 Otherwise use Emacs own tooltip implementation. | 5953 Otherwise use Emacs own tooltip implementation. |
6013 When using Gtk+ tooltips, the tooltip face is not used. */); | 5954 When using Gtk+ tooltips, the tooltip face is not used. */); |
6014 x_gtk_use_system_tooltips = 1; | 5955 x_gtk_use_system_tooltips = 1; |
6015 | 5956 |
6018 #ifdef USE_X_TOOLKIT | 5959 #ifdef USE_X_TOOLKIT |
6019 Fprovide (intern_c_string ("x-toolkit"), Qnil); | 5960 Fprovide (intern_c_string ("x-toolkit"), Qnil); |
6020 #ifdef USE_MOTIF | 5961 #ifdef USE_MOTIF |
6021 Fprovide (intern_c_string ("motif"), Qnil); | 5962 Fprovide (intern_c_string ("motif"), Qnil); |
6022 | 5963 |
6023 DEFVAR_LISP ("motif-version-string", &Vmotif_version_string, | 5964 DEFVAR_LISP ("motif-version-string", Vmotif_version_string, |
6024 doc: /* Version info for LessTif/Motif. */); | 5965 doc: /* Version info for LessTif/Motif. */); |
6025 Vmotif_version_string = build_string (XmVERSION_STRING); | 5966 Vmotif_version_string = build_string (XmVERSION_STRING); |
6026 #endif /* USE_MOTIF */ | 5967 #endif /* USE_MOTIF */ |
6027 #endif /* USE_X_TOOLKIT */ | 5968 #endif /* USE_X_TOOLKIT */ |
6028 | 5969 |
6033 accepts --with-x-toolkit=gtk. */ | 5974 accepts --with-x-toolkit=gtk. */ |
6034 Fprovide (intern_c_string ("x-toolkit"), Qnil); | 5975 Fprovide (intern_c_string ("x-toolkit"), Qnil); |
6035 Fprovide (intern_c_string ("gtk"), Qnil); | 5976 Fprovide (intern_c_string ("gtk"), Qnil); |
6036 Fprovide (intern_c_string ("move-toolbar"), Qnil); | 5977 Fprovide (intern_c_string ("move-toolbar"), Qnil); |
6037 | 5978 |
6038 DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string, | 5979 DEFVAR_LISP ("gtk-version-string", Vgtk_version_string, |
6039 doc: /* Version info for GTK+. */); | 5980 doc: /* Version info for GTK+. */); |
6040 { | 5981 { |
6041 char gtk_version[40]; | 5982 char gtk_version[40]; |
6042 g_snprintf (gtk_version, sizeof (gtk_version), "%u.%u.%u", | 5983 g_snprintf (gtk_version, sizeof (gtk_version), "%u.%u.%u", |
6043 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); | 5984 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); |