Mercurial > emacs
comparison src/minibuf.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 | 417b1e4d63cd |
children | f5af01a13248 |
comparison
equal
deleted
inserted
replaced
112363:6a0c66185ba1 | 112364:42e22c4f06b7 |
---|---|
52 | 52 |
53 int minibuf_level; | 53 int minibuf_level; |
54 | 54 |
55 /* The maximum length of a minibuffer history. */ | 55 /* The maximum length of a minibuffer history. */ |
56 | 56 |
57 Lisp_Object Qhistory_length, Vhistory_length; | 57 Lisp_Object Qhistory_length; |
58 | |
59 /* No duplicates in history. */ | |
60 | |
61 int history_delete_duplicates; | |
62 | |
63 /* Non-nil means add new input to history. */ | |
64 | |
65 Lisp_Object Vhistory_add_new_input; | |
66 | 58 |
67 /* Fread_minibuffer leaves the input here as a string. */ | 59 /* Fread_minibuffer leaves the input here as a string. */ |
68 | 60 |
69 Lisp_Object last_minibuf_string; | 61 Lisp_Object last_minibuf_string; |
70 | 62 |
71 /* Nonzero means let functions called when within a minibuffer | |
72 invoke recursive minibuffers (to read arguments, or whatever) */ | |
73 | |
74 int enable_recursive_minibuffers; | |
75 | |
76 /* Nonzero means don't ignore text properties | |
77 in Fread_from_minibuffer. */ | |
78 | |
79 int minibuffer_allow_text_properties; | |
80 | |
81 /* help-form is bound to this while in the minibuffer. */ | |
82 | |
83 Lisp_Object Vminibuffer_help_form; | |
84 | |
85 /* Variable which is the history list to add minibuffer values to. */ | |
86 | |
87 Lisp_Object Vminibuffer_history_variable; | |
88 | |
89 /* Current position in the history list (adjusted by M-n and M-p). */ | |
90 | |
91 Lisp_Object Vminibuffer_history_position; | |
92 | |
93 /* Text properties that are added to minibuffer prompts. | |
94 These are in addition to the basic `field' property, and stickiness | |
95 properties. */ | |
96 | |
97 Lisp_Object Vminibuffer_prompt_properties; | |
98 | |
99 Lisp_Object Qminibuffer_history, Qbuffer_name_history; | 63 Lisp_Object Qminibuffer_history, Qbuffer_name_history; |
100 | 64 |
101 Lisp_Object Qread_file_name_internal; | 65 Lisp_Object Qread_file_name_internal; |
102 | 66 |
103 /* Normal hooks for entry to and exit from minibuffer. */ | 67 /* Normal hooks for entry to and exit from minibuffer. */ |
104 | 68 |
105 Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook; | 69 Lisp_Object Qminibuffer_setup_hook; |
106 Lisp_Object Qminibuffer_exit_hook, Vminibuffer_exit_hook; | 70 Lisp_Object Qminibuffer_exit_hook; |
107 | 71 |
108 /* Function to call to read a buffer name. */ | |
109 Lisp_Object Vread_buffer_function; | |
110 | |
111 /* Nonzero means completion ignores case. */ | |
112 | |
113 int completion_ignore_case; | |
114 Lisp_Object Qcompletion_ignore_case; | 72 Lisp_Object Qcompletion_ignore_case; |
115 int read_buffer_completion_ignore_case; | 73 Lisp_Object Qminibuffer_completion_table; |
116 | 74 Lisp_Object Qminibuffer_completion_predicate; |
117 /* List of regexps that should restrict possible completions. */ | 75 Lisp_Object Qminibuffer_completion_confirm; |
118 | |
119 Lisp_Object Vcompletion_regexp_list; | |
120 | |
121 /* Nonzero means raise the minibuffer frame when the minibuffer | |
122 is entered. */ | |
123 | |
124 int minibuffer_auto_raise; | |
125 | |
126 /* Keymap for reading expressions. */ | |
127 Lisp_Object Vread_expression_map; | |
128 | |
129 Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table; | |
130 Lisp_Object Vminibuffer_completion_predicate, Qminibuffer_completion_predicate; | |
131 Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm; | |
132 Lisp_Object Vminibuffer_completing_file_name; | |
133 | |
134 Lisp_Object Quser_variable_p; | 76 Lisp_Object Quser_variable_p; |
135 | 77 |
136 Lisp_Object Qminibuffer_default; | 78 Lisp_Object Qminibuffer_default; |
137 | 79 |
138 Lisp_Object Qcurrent_input_method, Qactivate_input_method; | 80 Lisp_Object Qcurrent_input_method, Qactivate_input_method; |
2075 staticpro (&Qcase_fold_search); | 2017 staticpro (&Qcase_fold_search); |
2076 | 2018 |
2077 Qread_expression_history = intern_c_string ("read-expression-history"); | 2019 Qread_expression_history = intern_c_string ("read-expression-history"); |
2078 staticpro (&Qread_expression_history); | 2020 staticpro (&Qread_expression_history); |
2079 | 2021 |
2080 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function, | 2022 DEFVAR_LISP ("read-buffer-function", Vread_buffer_function, |
2081 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. | 2023 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. |
2082 The function is called with the arguments passed to `read-buffer'. */); | 2024 The function is called with the arguments passed to `read-buffer'. */); |
2083 Vread_buffer_function = Qnil; | 2025 Vread_buffer_function = Qnil; |
2084 | 2026 |
2085 DEFVAR_BOOL ("read-buffer-completion-ignore-case", | 2027 DEFVAR_BOOL ("read-buffer-completion-ignore-case", |
2086 &read_buffer_completion_ignore_case, | 2028 read_buffer_completion_ignore_case, |
2087 doc: /* *Non-nil means completion ignores case when reading a buffer name. */); | 2029 doc: /* *Non-nil means completion ignores case when reading a buffer name. */); |
2088 read_buffer_completion_ignore_case = 0; | 2030 read_buffer_completion_ignore_case = 0; |
2089 | 2031 |
2090 DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook, | 2032 DEFVAR_LISP ("minibuffer-setup-hook", Vminibuffer_setup_hook, |
2091 doc: /* Normal hook run just after entry to minibuffer. */); | 2033 doc: /* Normal hook run just after entry to minibuffer. */); |
2092 Vminibuffer_setup_hook = Qnil; | 2034 Vminibuffer_setup_hook = Qnil; |
2093 | 2035 |
2094 DEFVAR_LISP ("minibuffer-exit-hook", &Vminibuffer_exit_hook, | 2036 DEFVAR_LISP ("minibuffer-exit-hook", Vminibuffer_exit_hook, |
2095 doc: /* Normal hook run just after exit from minibuffer. */); | 2037 doc: /* Normal hook run just after exit from minibuffer. */); |
2096 Vminibuffer_exit_hook = Qnil; | 2038 Vminibuffer_exit_hook = Qnil; |
2097 | 2039 |
2098 DEFVAR_LISP ("history-length", &Vhistory_length, | 2040 DEFVAR_LISP ("history-length", Vhistory_length, |
2099 doc: /* *Maximum length for history lists before truncation takes place. | 2041 doc: /* *Maximum length for history lists before truncation takes place. |
2100 A number means that length; t means infinite. Truncation takes place | 2042 A number means that length; t means infinite. Truncation takes place |
2101 just after a new element is inserted. Setting the `history-length' | 2043 just after a new element is inserted. Setting the `history-length' |
2102 property of a history variable overrides this default. */); | 2044 property of a history variable overrides this default. */); |
2103 XSETFASTINT (Vhistory_length, 30); | 2045 XSETFASTINT (Vhistory_length, 30); |
2104 | 2046 |
2105 DEFVAR_BOOL ("history-delete-duplicates", &history_delete_duplicates, | 2047 DEFVAR_BOOL ("history-delete-duplicates", history_delete_duplicates, |
2106 doc: /* *Non-nil means to delete duplicates in history. | 2048 doc: /* *Non-nil means to delete duplicates in history. |
2107 If set to t when adding a new history element, all previous identical | 2049 If set to t when adding a new history element, all previous identical |
2108 elements are deleted from the history list. */); | 2050 elements are deleted from the history list. */); |
2109 history_delete_duplicates = 0; | 2051 history_delete_duplicates = 0; |
2110 | 2052 |
2111 DEFVAR_LISP ("history-add-new-input", &Vhistory_add_new_input, | 2053 DEFVAR_LISP ("history-add-new-input", Vhistory_add_new_input, |
2112 doc: /* *Non-nil means to add new elements in history. | 2054 doc: /* *Non-nil means to add new elements in history. |
2113 If set to nil, minibuffer reading functions don't add new elements to the | 2055 If set to nil, minibuffer reading functions don't add new elements to the |
2114 history list, so it is possible to do this afterwards by calling | 2056 history list, so it is possible to do this afterwards by calling |
2115 `add-to-history' explicitly. */); | 2057 `add-to-history' explicitly. */); |
2116 Vhistory_add_new_input = Qt; | 2058 Vhistory_add_new_input = Qt; |
2117 | 2059 |
2118 DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case, | 2060 DEFVAR_BOOL ("completion-ignore-case", completion_ignore_case, |
2119 doc: /* Non-nil means don't consider case significant in completion. | 2061 doc: /* Non-nil means don't consider case significant in completion. |
2120 For file-name completion, `read-file-name-completion-ignore-case' | 2062 For file-name completion, `read-file-name-completion-ignore-case' |
2121 controls the behavior, rather than this variable. | 2063 controls the behavior, rather than this variable. |
2122 For buffer name completion, `read-buffer-completion-ignore-case' | 2064 For buffer name completion, `read-buffer-completion-ignore-case' |
2123 controls the behavior, rather than this variable. */); | 2065 controls the behavior, rather than this variable. */); |
2124 completion_ignore_case = 0; | 2066 completion_ignore_case = 0; |
2125 | 2067 |
2126 DEFVAR_BOOL ("enable-recursive-minibuffers", &enable_recursive_minibuffers, | 2068 DEFVAR_BOOL ("enable-recursive-minibuffers", enable_recursive_minibuffers, |
2127 doc: /* *Non-nil means to allow minibuffer commands while in the minibuffer. | 2069 doc: /* *Non-nil means to allow minibuffer commands while in the minibuffer. |
2128 This variable makes a difference whenever the minibuffer window is active. */); | 2070 This variable makes a difference whenever the minibuffer window is active. */); |
2129 enable_recursive_minibuffers = 0; | 2071 enable_recursive_minibuffers = 0; |
2130 | 2072 |
2131 DEFVAR_LISP ("minibuffer-completion-table", &Vminibuffer_completion_table, | 2073 DEFVAR_LISP ("minibuffer-completion-table", Vminibuffer_completion_table, |
2132 doc: /* Alist or obarray used for completion in the minibuffer. | 2074 doc: /* Alist or obarray used for completion in the minibuffer. |
2133 This becomes the ALIST argument to `try-completion' and `all-completions'. | 2075 This becomes the ALIST argument to `try-completion' and `all-completions'. |
2134 The value can also be a list of strings or a hash table. | 2076 The value can also be a list of strings or a hash table. |
2135 | 2077 |
2136 The value may alternatively be a function, which is given three arguments: | 2078 The value may alternatively be a function, which is given three arguments: |
2141 nil -- return the best completion of STRING, or nil if there is none. | 2083 nil -- return the best completion of STRING, or nil if there is none. |
2142 t -- return a list of all possible completions of STRING. | 2084 t -- return a list of all possible completions of STRING. |
2143 lambda -- return t if STRING is a valid completion as it stands. */); | 2085 lambda -- return t if STRING is a valid completion as it stands. */); |
2144 Vminibuffer_completion_table = Qnil; | 2086 Vminibuffer_completion_table = Qnil; |
2145 | 2087 |
2146 DEFVAR_LISP ("minibuffer-completion-predicate", &Vminibuffer_completion_predicate, | 2088 DEFVAR_LISP ("minibuffer-completion-predicate", Vminibuffer_completion_predicate, |
2147 doc: /* Within call to `completing-read', this holds the PREDICATE argument. */); | 2089 doc: /* Within call to `completing-read', this holds the PREDICATE argument. */); |
2148 Vminibuffer_completion_predicate = Qnil; | 2090 Vminibuffer_completion_predicate = Qnil; |
2149 | 2091 |
2150 DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm, | 2092 DEFVAR_LISP ("minibuffer-completion-confirm", Vminibuffer_completion_confirm, |
2151 doc: /* Whether to demand confirmation of completion before exiting minibuffer. | 2093 doc: /* Whether to demand confirmation of completion before exiting minibuffer. |
2152 If nil, confirmation is not required. | 2094 If nil, confirmation is not required. |
2153 If the value is `confirm', the user may exit with an input that is not | 2095 If the value is `confirm', the user may exit with an input that is not |
2154 a valid completion alternative, but Emacs asks for confirmation. | 2096 a valid completion alternative, but Emacs asks for confirmation. |
2155 If the value is `confirm-after-completion', the user may exit with an | 2097 If the value is `confirm-after-completion', the user may exit with an |
2157 confirmation if the user submitted the input right after any of the | 2099 confirmation if the user submitted the input right after any of the |
2158 completion commands listed in `minibuffer-confirm-exit-commands'. */); | 2100 completion commands listed in `minibuffer-confirm-exit-commands'. */); |
2159 Vminibuffer_completion_confirm = Qnil; | 2101 Vminibuffer_completion_confirm = Qnil; |
2160 | 2102 |
2161 DEFVAR_LISP ("minibuffer-completing-file-name", | 2103 DEFVAR_LISP ("minibuffer-completing-file-name", |
2162 &Vminibuffer_completing_file_name, | 2104 Vminibuffer_completing_file_name, |
2163 doc: /* Non-nil means completing file names. */); | 2105 doc: /* Non-nil means completing file names. */); |
2164 Vminibuffer_completing_file_name = Qnil; | 2106 Vminibuffer_completing_file_name = Qnil; |
2165 | 2107 |
2166 DEFVAR_LISP ("minibuffer-help-form", &Vminibuffer_help_form, | 2108 DEFVAR_LISP ("minibuffer-help-form", Vminibuffer_help_form, |
2167 doc: /* Value that `help-form' takes on inside the minibuffer. */); | 2109 doc: /* Value that `help-form' takes on inside the minibuffer. */); |
2168 Vminibuffer_help_form = Qnil; | 2110 Vminibuffer_help_form = Qnil; |
2169 | 2111 |
2170 DEFVAR_LISP ("minibuffer-history-variable", &Vminibuffer_history_variable, | 2112 DEFVAR_LISP ("minibuffer-history-variable", Vminibuffer_history_variable, |
2171 doc: /* History list symbol to add minibuffer values to. | 2113 doc: /* History list symbol to add minibuffer values to. |
2172 Each string of minibuffer input, as it appears on exit from the minibuffer, | 2114 Each string of minibuffer input, as it appears on exit from the minibuffer, |
2173 is added with | 2115 is added with |
2174 (set minibuffer-history-variable | 2116 (set minibuffer-history-variable |
2175 (cons STRING (symbol-value minibuffer-history-variable))) */); | 2117 (cons STRING (symbol-value minibuffer-history-variable))) */); |
2176 XSETFASTINT (Vminibuffer_history_variable, 0); | 2118 XSETFASTINT (Vminibuffer_history_variable, 0); |
2177 | 2119 |
2178 DEFVAR_LISP ("minibuffer-history-position", &Vminibuffer_history_position, | 2120 DEFVAR_LISP ("minibuffer-history-position", Vminibuffer_history_position, |
2179 doc: /* Current position of redoing in the history list. */); | 2121 doc: /* Current position of redoing in the history list. */); |
2180 Vminibuffer_history_position = Qnil; | 2122 Vminibuffer_history_position = Qnil; |
2181 | 2123 |
2182 DEFVAR_BOOL ("minibuffer-auto-raise", &minibuffer_auto_raise, | 2124 DEFVAR_BOOL ("minibuffer-auto-raise", minibuffer_auto_raise, |
2183 doc: /* *Non-nil means entering the minibuffer raises the minibuffer's frame. | 2125 doc: /* *Non-nil means entering the minibuffer raises the minibuffer's frame. |
2184 Some uses of the echo area also raise that frame (since they use it too). */); | 2126 Some uses of the echo area also raise that frame (since they use it too). */); |
2185 minibuffer_auto_raise = 0; | 2127 minibuffer_auto_raise = 0; |
2186 | 2128 |
2187 DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list, | 2129 DEFVAR_LISP ("completion-regexp-list", Vcompletion_regexp_list, |
2188 doc: /* List of regexps that should restrict possible completions. | 2130 doc: /* List of regexps that should restrict possible completions. |
2189 The basic completion functions only consider a completion acceptable | 2131 The basic completion functions only consider a completion acceptable |
2190 if it matches all regular expressions in this list, with | 2132 if it matches all regular expressions in this list, with |
2191 `case-fold-search' bound to the value of `completion-ignore-case'. | 2133 `case-fold-search' bound to the value of `completion-ignore-case'. |
2192 See Info node `(elisp)Basic Completion', for a description of these | 2134 See Info node `(elisp)Basic Completion', for a description of these |
2193 functions. */); | 2135 functions. */); |
2194 Vcompletion_regexp_list = Qnil; | 2136 Vcompletion_regexp_list = Qnil; |
2195 | 2137 |
2196 DEFVAR_BOOL ("minibuffer-allow-text-properties", | 2138 DEFVAR_BOOL ("minibuffer-allow-text-properties", |
2197 &minibuffer_allow_text_properties, | 2139 minibuffer_allow_text_properties, |
2198 doc: /* Non-nil means `read-from-minibuffer' should not discard text properties. | 2140 doc: /* Non-nil means `read-from-minibuffer' should not discard text properties. |
2199 This also affects `read-string', but it does not affect `read-minibuffer', | 2141 This also affects `read-string', but it does not affect `read-minibuffer', |
2200 `read-no-blanks-input', or any of the functions that do minibuffer input | 2142 `read-no-blanks-input', or any of the functions that do minibuffer input |
2201 with completion; they always discard text properties. */); | 2143 with completion; they always discard text properties. */); |
2202 minibuffer_allow_text_properties = 0; | 2144 minibuffer_allow_text_properties = 0; |
2203 | 2145 |
2204 DEFVAR_LISP ("minibuffer-prompt-properties", &Vminibuffer_prompt_properties, | 2146 DEFVAR_LISP ("minibuffer-prompt-properties", Vminibuffer_prompt_properties, |
2205 doc: /* Text properties that are added to minibuffer prompts. | 2147 doc: /* Text properties that are added to minibuffer prompts. |
2206 These are in addition to the basic `field' property, and stickiness | 2148 These are in addition to the basic `field' property, and stickiness |
2207 properties. */); | 2149 properties. */); |
2208 /* We use `intern' here instead of Qread_only to avoid | 2150 /* We use `intern' here instead of Qread_only to avoid |
2209 initialization-order problems. */ | 2151 initialization-order problems. */ |
2210 Vminibuffer_prompt_properties | 2152 Vminibuffer_prompt_properties |
2211 = Fcons (intern_c_string ("read-only"), Fcons (Qt, Qnil)); | 2153 = Fcons (intern_c_string ("read-only"), Fcons (Qt, Qnil)); |
2212 | 2154 |
2213 DEFVAR_LISP ("read-expression-map", &Vread_expression_map, | 2155 DEFVAR_LISP ("read-expression-map", Vread_expression_map, |
2214 doc: /* Minibuffer keymap used for reading Lisp expressions. */); | 2156 doc: /* Minibuffer keymap used for reading Lisp expressions. */); |
2215 Vread_expression_map = Qnil; | 2157 Vread_expression_map = Qnil; |
2216 | 2158 |
2217 defsubr (&Sset_minibuffer_window); | 2159 defsubr (&Sset_minibuffer_window); |
2218 defsubr (&Sread_from_minibuffer); | 2160 defsubr (&Sread_from_minibuffer); |