annotate src/undo.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 ef719132ddfa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* undo handling for GNU Emacs.
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 68651
diff changeset
2 Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
112218
376148b31b5e Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
3 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
7 GNU Emacs is free software: you can redistribute it and/or modify
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
8 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
9 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
10 (at your option) any later version.
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
15 GNU General Public License for more details.
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
16
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 12649
diff changeset
17 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93663
diff changeset
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 3719
diff changeset
21 #include <config.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101583
diff changeset
22 #include <setjmp.h>
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include "lisp.h"
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "buffer.h"
6180
d369907be635 (record_delete): Save last_point_position in the undo record, rather than the
Karl Heuer <kwzh@gnu.org>
parents: 5762
diff changeset
25 #include "commands.h"
67821
11268b0660c8 Depend on window.h.
Richard M. Stallman <rms@gnu.org>
parents: 67339
diff changeset
26 #include "window.h"
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 /* Last buffer for which undo information was recorded. */
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
29 /* BEWARE: This is not traced by the GC, so never dereference it! */
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
30 struct buffer *last_undo_buffer;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
31
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
32 /* Position of point last time we inserted a boundary. */
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
33 struct buffer *last_boundary_buffer;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
34 EMACS_INT last_boundary_position;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
36 Lisp_Object Qinhibit_read_only;
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
37
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
38 /* Marker for function call undo list elements. */
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
39
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
40 Lisp_Object Qapply;
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
41
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
42 /* The first time a command records something for undo.
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
43 it also allocates the undo-boundary object
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
44 which will be added to the list at the end of the command.
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
45 This ensures we can't run out of space while trying to make
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
46 an undo-boundary. */
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
47 Lisp_Object pending_boundary;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
48
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
49 /* Record point as it was at beginning of this command (if necessary)
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
50 and prepare the undo info for recording a change.
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
51 PT is the position of point that will naturally occur as a result of the
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
52 undo record that will be added just after this command terminates. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
53
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
54 static void
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
55 record_point (EMACS_INT pt)
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
56 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
57 int at_boundary;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
58
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
59 /* Don't record position of pt when undo_inhibit_record_point holds. */
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
60 if (undo_inhibit_record_point)
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
61 return;
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
62
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
63 /* Allocate a cons cell to be the undo boundary after this command. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
64 if (NILP (pending_boundary))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
65 pending_boundary = Fcons (Qnil, Qnil);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
66
98295
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
67 if ((current_buffer != last_undo_buffer)
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
68 /* Don't call Fundo_boundary for the first change. Otherwise we
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
69 risk overwriting last_boundary_position in Fundo_boundary with
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
70 PT of the current buffer and as a consequence not insert an
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
71 undo boundary because last_boundary_position will equal pt in
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
72 the test at the end of the present function (Bug#731). */
a7da9fedfcf9 (record_point): Don't call Fundo_boundary for first
Martin Rudalics <rudalics@gmx.at>
parents: 94963
diff changeset
73 && (MODIFF > SAVE_MODIFF))
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
74 Fundo_boundary ();
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
75 last_undo_buffer = current_buffer;
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
76
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
77 if (CONSP (current_buffer->undo_list))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
78 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
79 /* Set AT_BOUNDARY to 1 only when we have nothing other than
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
80 marker adjustment before undo boundary. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
81
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
82 Lisp_Object tail = current_buffer->undo_list, elt;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
83
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
84 while (1)
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
85 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
86 if (NILP (tail))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
87 elt = Qnil;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
88 else
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
89 elt = XCAR (tail);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
90 if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt))))
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
91 break;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
92 tail = XCDR (tail);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
93 }
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
94 at_boundary = NILP (elt);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
95 }
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
96 else
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
97 at_boundary = 1;
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
98
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
99 if (MODIFF <= SAVE_MODIFF)
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
100 record_first_change ();
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
101
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48326
diff changeset
102 /* If we are just after an undo boundary, and
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
103 point wasn't at start of deleted range, record where it was. */
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
104 if (at_boundary
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
105 && current_buffer == last_boundary_buffer
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
106 && last_boundary_position != pt)
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
107 current_buffer->undo_list
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
108 = Fcons (make_number (last_boundary_position), current_buffer->undo_list);
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
109 }
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
110
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 /* Record an insertion that just happened or is about to happen,
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 for LENGTH characters at position BEG.
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 (It is possible to record an insertion before or after the fact
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114 because we don't need to record the contents.) */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115
20372
259194f66d40 (record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents: 17447
diff changeset
116 void
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
117 record_insert (EMACS_INT beg, EMACS_INT length)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 Lisp_Object lbeg, lend;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120
2194
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
121 if (EQ (current_buffer->undo_list, Qt))
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
122 return;
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
123
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
124 record_point (beg);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 /* If this is following another insertion and consecutive with it
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 in the buffer, combine the two. */
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
128 if (CONSP (current_buffer->undo_list))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130 Lisp_Object elt;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
131 elt = XCAR (current_buffer->undo_list);
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
132 if (CONSP (elt)
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
133 && INTEGERP (XCAR (elt))
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
134 && INTEGERP (XCDR (elt))
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
135 && XINT (XCDR (elt)) == beg)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 {
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39798
diff changeset
137 XSETCDR (elt, make_number (beg + length));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
138 return;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
139 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141
12088
f0c9d02fb6e4 (record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents: 10300
diff changeset
142 XSETFASTINT (lbeg, beg);
f0c9d02fb6e4 (record_insert): Change args to be ints, not Lisp_Objects.
Karl Heuer <kwzh@gnu.org>
parents: 10300
diff changeset
143 XSETINT (lend, beg + length);
1524
91454bf15944 * undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents: 1320
diff changeset
144 current_buffer->undo_list = Fcons (Fcons (lbeg, lend),
91454bf15944 * undo.c (record_insert): Use accessors on BEG and LENGTH.
Jim Blandy <jimb@redhat.com>
parents: 1320
diff changeset
145 current_buffer->undo_list);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 /* Record that a deletion is about to take place,
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
149 of the characters in STRING, at location BEG. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150
20373
b6c215dec8c8 (record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents: 20372
diff changeset
151 void
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
152 record_delete (EMACS_INT beg, Lisp_Object string)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 {
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
154 Lisp_Object sbeg;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155
2194
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
156 if (EQ (current_buffer->undo_list, Qt))
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
157 return;
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
158
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46285
diff changeset
159 if (PT == beg + SCHARS (string))
21272
b1bc69132f55 (record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents: 21237
diff changeset
160 {
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
161 XSETINT (sbeg, -beg);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
162 record_point (PT);
21272
b1bc69132f55 (record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents: 21237
diff changeset
163 }
b1bc69132f55 (record_delete): Record last_point_position when there's
Kenichi Handa <handa@m17n.org>
parents: 21237
diff changeset
164 else
44391
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
165 {
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
166 XSETFASTINT (sbeg, beg);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
167 record_point (beg);
0abb30765386 (record_point): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
168 }
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
169
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170 current_buffer->undo_list
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
171 = Fcons (Fcons (string, sbeg), current_buffer->undo_list);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
174 /* Record the fact that MARKER is about to be adjusted by ADJUSTMENT.
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
175 This is done only when a marker points within text being deleted,
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
176 because that's the only case where an automatic marker adjustment
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
177 won't be inverted automatically by undoing the buffer modification. */
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
178
20373
b6c215dec8c8 (record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents: 20372
diff changeset
179 void
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
180 record_marker_adjustment (Lisp_Object marker, EMACS_INT adjustment)
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
181 {
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
182 if (EQ (current_buffer->undo_list, Qt))
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
183 return;
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
184
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
185 /* Allocate a cons cell to be the undo boundary after this command. */
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
186 if (NILP (pending_boundary))
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
187 pending_boundary = Fcons (Qnil, Qnil);
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
188
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
189 if (current_buffer != last_undo_buffer)
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
190 Fundo_boundary ();
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
191 last_undo_buffer = current_buffer;
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
192
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
193 current_buffer->undo_list
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
194 = Fcons (Fcons (marker, make_number (adjustment)),
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
195 current_buffer->undo_list);
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
196 }
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
197
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 /* Record that a replacement is about to take place,
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
199 for LENGTH characters at location BEG.
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
200 The replacement must not change the number of characters. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201
20373
b6c215dec8c8 (record_delete, record_marker_adjustment): Declare them as void.
Kenichi Handa <handa@m17n.org>
parents: 20372
diff changeset
202 void
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
203 record_change (EMACS_INT beg, EMACS_INT length)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 {
21237
c5a8ee5b9b39 (record_delete): Replace LENGTH arg with STRING.
Richard M. Stallman <rms@gnu.org>
parents: 20373
diff changeset
205 record_delete (beg, make_buffer_string (beg, beg + length, 1));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 record_insert (beg, length);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 /* Record that an unmodified buffer is about to be changed.
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 Record the file modification date so that when undoing this entry
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 we can tell whether it is obsolete because the file was saved again. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212
20372
259194f66d40 (record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents: 17447
diff changeset
213 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106815
diff changeset
214 record_first_change (void)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 Lisp_Object high, low;
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
217 struct buffer *base_buffer = current_buffer;
5762
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
218
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
219 if (EQ (current_buffer->undo_list, Qt))
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
220 return;
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
221
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
222 if (current_buffer != last_undo_buffer)
5762
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
223 Fundo_boundary ();
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
224 last_undo_buffer = current_buffer;
5762
099857a46901 (record_first_change): Check for buffer-undo-list = t.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
225
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
226 if (base_buffer->base_buffer)
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
227 base_buffer = base_buffer->base_buffer;
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
228
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
229 XSETFASTINT (high, (base_buffer->modtime >> 16) & 0xffff);
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
230 XSETFASTINT (low, base_buffer->modtime & 0xffff);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
234 /* Record a change in property PROP (whose old value was VAL)
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
235 for LENGTH characters starting at position BEG in BUFFER. */
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
236
20372
259194f66d40 (record_change, record_first_change,
Kenichi Handa <handa@m17n.org>
parents: 17447
diff changeset
237 void
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
238 record_property_change (EMACS_INT beg, EMACS_INT length,
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
239 Lisp_Object prop, Lisp_Object value,
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
240 Lisp_Object buffer)
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
241 {
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
242 Lisp_Object lbeg, lend, entry;
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
243 struct buffer *obuf = current_buffer, *buf = XBUFFER (buffer);
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
244 int boundary = 0;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
245
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
246 if (EQ (buf->undo_list, Qt))
2194
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
247 return;
886a69457557 (record_property_change, record_delete, record_insert):
Richard M. Stallman <rms@gnu.org>
parents: 1968
diff changeset
248
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
249 /* Allocate a cons cell to be the undo boundary after this command. */
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
250 if (NILP (pending_boundary))
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
251 pending_boundary = Fcons (Qnil, Qnil);
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
252
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
253 if (buf != last_undo_buffer)
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
254 boundary = 1;
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
255 last_undo_buffer = buf;
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
256
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
257 /* Switch temporarily to the buffer that was changed. */
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
258 current_buffer = buf;
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
259
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
260 if (boundary)
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
261 Fundo_boundary ();
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
262
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
263 if (MODIFF <= SAVE_MODIFF)
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
264 record_first_change ();
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
265
9281
05b2bd5d5559 (record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents: 9108
diff changeset
266 XSETINT (lbeg, beg);
05b2bd5d5559 (record_insert, record_delete, record_first_change, record_property_change):
Karl Heuer <kwzh@gnu.org>
parents: 9108
diff changeset
267 XSETINT (lend, beg + length);
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
268 entry = Fcons (Qnil, Fcons (prop, Fcons (value, Fcons (lbeg, lend))));
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
269 current_buffer->undo_list = Fcons (entry, current_buffer->undo_list);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
270
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
271 current_buffer = obuf;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
272 }
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
273
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274 DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
275 doc: /* Mark a boundary between units of undo.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
276 An undo command will stop at this point,
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
277 but another undo command will undo to the previous boundary. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
278 (void)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 Lisp_Object tem;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
281 if (EQ (current_buffer->undo_list, Qt))
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
282 return Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
283 tem = Fcar (current_buffer->undo_list);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
284 if (!NILP (tem))
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
285 {
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
286 /* One way or another, cons nil onto the front of the undo list. */
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
287 if (!NILP (pending_boundary))
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
288 {
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
289 /* If we have preallocated the cons cell to use here,
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
290 use that one. */
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39798
diff changeset
291 XSETCDR (pending_boundary, current_buffer->undo_list);
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
292 current_buffer->undo_list = pending_boundary;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
293 pending_boundary = Qnil;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
294 }
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
295 else
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
296 current_buffer->undo_list = Fcons (Qnil, current_buffer->undo_list);
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
297 }
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
298 last_boundary_position = PT;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
299 last_boundary_buffer = current_buffer;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
300 return Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
303 /* At garbage collection time, make an undo list shorter at the end,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
304 returning the truncated list. How this is done depends on the
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
305 variables undo-limit, undo-strong-limit and undo-outer-limit.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
306 In some cases this works by calling undo-outer-limit-function. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
307
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
308 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106815
diff changeset
309 truncate_undo_list (struct buffer *b)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
310 {
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
311 Lisp_Object list;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312 Lisp_Object prev, next, last_boundary;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 int size_so_far = 0;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
315 /* Make sure that calling undo-outer-limit-function
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
316 won't cause another GC. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
317 int count = inhibit_garbage_collection ();
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
318
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
319 /* Make the buffer current to get its local values of variables such
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
320 as undo_limit. Also so that Vundo_outer_limit_function can
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
321 tell which buffer to operate on. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
322 record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
323 set_buffer_internal (b);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
324
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
325 list = b->undo_list;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
326
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
327 prev = Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328 next = list;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329 last_boundary = Qnil;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
331 /* If the first element is an undo boundary, skip past it. */
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
332 if (CONSP (next) && NILP (XCAR (next)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 /* Add in the space occupied by this element and its chain link. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 size_so_far += sizeof (struct Lisp_Cons);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
337 /* Advance to next element. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 prev = next;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
339 next = XCDR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
340 }
55839
9e7829a684df (truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
341
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
342 /* Always preserve at least the most recent undo record
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
343 unless it is really horribly big.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
344
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
345 Skip, skip, skip the undo, skip, skip, skip the undo,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
346 Skip, skip, skip the undo, skip to the undo bound'ry. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
347
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
348 while (CONSP (next) && ! NILP (XCAR (next)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
349 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 Lisp_Object elt;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
351 elt = XCAR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353 /* Add in the space occupied by this element and its chain link. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 size_so_far += sizeof (struct Lisp_Cons);
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
355 if (CONSP (elt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 size_so_far += sizeof (struct Lisp_Cons);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
358 if (STRINGP (XCAR (elt)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359 size_so_far += (sizeof (struct Lisp_String) - 1
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46285
diff changeset
360 + SCHARS (XCAR (elt)));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 /* Advance to next element. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 prev = next;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
365 next = XCDR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 }
55839
9e7829a684df (truncate_undo_list): New arg LIMITSIZE.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
367
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
368 /* If by the first boundary we have already passed undo_outer_limit,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
369 we're heading for memory full, so offer to clear out the list. */
59069
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
370 if (INTEGERP (Vundo_outer_limit)
27371673eba8 (Vundo_outer_limit): Replaces undo_outer_limit. Uses changed.
Richard M. Stallman <rms@gnu.org>
parents: 59048
diff changeset
371 && size_so_far > XINT (Vundo_outer_limit)
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
372 && !NILP (Vundo_outer_limit_function))
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
373 {
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
374 Lisp_Object tem;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
375 struct buffer *temp = last_undo_buffer;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
376
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
377 /* Normally the function this calls is undo-outer-limit-truncate. */
67339
7a9d49053af3 (truncate_undo_list): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents: 64770
diff changeset
378 tem = call1 (Vundo_outer_limit_function, make_number (size_so_far));
7a9d49053af3 (truncate_undo_list): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents: 64770
diff changeset
379 if (! NILP (tem))
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
380 {
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
381 /* The function is responsible for making
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
382 any desired changes in buffer-undo-list. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
383 unbind_to (count, Qnil);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
384 return;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
385 }
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
386 /* That function probably used the minibuffer, and if so, that
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
387 changed last_undo_buffer. Change it back so that we don't
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
388 force next change to make an undo boundary here. */
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
389 last_undo_buffer = temp;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
390 }
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
391
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
392 if (CONSP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 last_boundary = prev;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
395 /* Keep additional undo data, if it fits in the limits. */
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
396 while (CONSP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 Lisp_Object elt;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
399 elt = XCAR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 /* When we get to a boundary, decide whether to truncate
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
402 either before or after it. The lower threshold, undo_limit,
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 tells us to truncate after it. If its size pushes past
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
404 the higher threshold undo_strong_limit, we truncate before it. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
405 if (NILP (elt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 {
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
407 if (size_so_far > undo_strong_limit)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
408 break;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
409 last_boundary = prev;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
410 if (size_so_far > undo_limit)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
411 break;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
413
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
414 /* Add in the space occupied by this element and its chain link. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
415 size_so_far += sizeof (struct Lisp_Cons);
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
416 if (CONSP (elt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417 {
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
418 size_so_far += sizeof (struct Lisp_Cons);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
419 if (STRINGP (XCAR (elt)))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
420 size_so_far += (sizeof (struct Lisp_String) - 1
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46285
diff changeset
421 + SCHARS (XCAR (elt)));
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
422 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
423
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424 /* Advance to next element. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
425 prev = next;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 21514
diff changeset
426 next = XCDR (next);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
428
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429 /* If we scanned the whole list, it is short enough; don't change it. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
430 if (NILP (next))
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
431 ;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 /* Truncate at the boundary where we decided to truncate. */
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
433 else if (!NILP (last_boundary))
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
434 XSETCDR (last_boundary, Qnil);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
435 /* There's nothing we decided to keep, so clear it out. */
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
436 else
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
437 b->undo_list = Qnil;
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
438
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
439 unbind_to (count, Qnil);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0,
40123
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
443 doc: /* Undo N records from the front of the list LIST.
e528f2adeed4 Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39973
diff changeset
444 Return what remains of the list. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
445 (Lisp_Object n, Lisp_Object list)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446 {
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
447 struct gcpro gcpro1, gcpro2;
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
448 Lisp_Object next;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 44391
diff changeset
449 int count = SPECPDL_INDEX ();
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
450 register int arg;
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
451 Lisp_Object oldlist;
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
452 int did_apply = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48326
diff changeset
453
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
454 #if 0 /* This is a good feature, but would make undo-start
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
455 unable to do what is expected. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
456 Lisp_Object tem;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
457
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
458 /* If the head of the list is a boundary, it is the boundary
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
459 preceding this command. Get rid of it and don't count it. */
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
460 tem = Fcar (list);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
461 if (NILP (tem))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 list = Fcdr (list);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 #endif
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40123
diff changeset
465 CHECK_NUMBER (n);
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
466 arg = XINT (n);
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
467 next = Qnil;
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
468 GCPRO2 (next, list);
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
469 /* I don't think we need to gcpro oldlist, as we use it only
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
470 to check for EQ. ++kfs */
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
471
37527
d585b711c8d2 (Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents: 34965
diff changeset
472 /* In a writable buffer, enable undoing read-only text that is so
d585b711c8d2 (Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents: 34965
diff changeset
473 because of text properties. */
d585b711c8d2 (Fprimitive_undo): In a writable buffer, enable undoing
Gerd Moellmann <gerd@gnu.org>
parents: 34965
diff changeset
474 if (NILP (current_buffer->read_only))
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
475 specbind (Qinhibit_read_only, Qt);
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
476
34794
12ca043196d7 (Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents: 34169
diff changeset
477 /* Don't let `intangible' properties interfere with undo. */
12ca043196d7 (Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents: 34169
diff changeset
478 specbind (Qinhibit_point_motion_hooks, Qt);
12ca043196d7 (Fprimitive_undo): Bind `inhibit-point-motion-hooks' to t.
Gerd Moellmann <gerd@gnu.org>
parents: 34169
diff changeset
479
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
480 oldlist = current_buffer->undo_list;
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
481
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482 while (arg > 0)
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483 {
39798
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
484 while (CONSP (list))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 {
39798
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
486 next = XCAR (list);
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
487 list = XCDR (list);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
488 /* Exit inner loop at undo boundary. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 241
diff changeset
489 if (NILP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 break;
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
491 /* Handle an integer by setting point to that value. */
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
492 if (INTEGERP (next))
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
493 SET_PT (clip_to_bounds (BEGV, XINT (next), ZV));
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
494 else if (CONSP (next))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495 {
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
496 Lisp_Object car, cdr;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
497
39798
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
498 car = XCAR (next);
d54a90934144 (Fprimitive_undo): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37527
diff changeset
499 cdr = XCDR (next);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
500 if (EQ (car, Qt))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 {
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
502 /* Element (t high . low) records previous modtime. */
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
503 Lisp_Object high, low;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
504 int mod_time;
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
505 struct buffer *base_buffer = current_buffer;
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
506
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
507 high = Fcar (cdr);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
508 low = Fcdr (cdr);
3687
54381151027d (record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
509 mod_time = (XFASTINT (high) << 16) + XFASTINT (low);
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
510
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
511 if (current_buffer->base_buffer)
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
512 base_buffer = current_buffer->base_buffer;
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
513
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
514 /* If this records an obsolete save
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
515 (not matching the actual disk file)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
516 then don't mark unmodified. */
10300
323ad02feb1e (Fprimitive_undo): Use base buffer's modtime field.
Richard M. Stallman <rms@gnu.org>
parents: 9322
diff changeset
517 if (mod_time != base_buffer->modtime)
12649
43434a01d442 (Fprimitive_undo): Don't end inner loop
Richard M. Stallman <rms@gnu.org>
parents: 12088
diff changeset
518 continue;
1598
3e9dadf2d13c * undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents: 1524
diff changeset
519 #ifdef CLASH_DETECTION
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
520 Funlock_buffer ();
1598
3e9dadf2d13c * undo.c (Fprimitive_undo): Remove whitespace in front of #ifdef
Jim Blandy <jimb@redhat.com>
parents: 1524
diff changeset
521 #endif /* CLASH_DETECTION */
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
522 Fset_buffer_modified_p (Qnil);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
523 }
3687
54381151027d (record_delete): Always use XFASTINT on sbeg.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
524 else if (EQ (car, Qnil))
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
525 {
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
526 /* Element (nil PROP VAL BEG . END) is property change. */
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
527 Lisp_Object beg, end, prop, val;
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
528
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
529 prop = Fcar (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
530 cdr = Fcdr (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
531 val = Fcar (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
532 cdr = Fcdr (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
533 beg = Fcar (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
534 end = Fcdr (cdr);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
535
76800
3f97b6926170 (Fprimitive_undo): Give clearer error message when trying to change
Chong Yidong <cyd@stupidchicken.com>
parents: 75227
diff changeset
536 if (XINT (beg) < BEGV || XINT (end) > ZV)
3f97b6926170 (Fprimitive_undo): Give clearer error message when trying to change
Chong Yidong <cyd@stupidchicken.com>
parents: 75227
diff changeset
537 error ("Changes to be undone are outside visible portion of buffer");
1968
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
538 Fput_text_property (beg, end, prop, val, Qnil);
de0a0ed7318e (record_property_change): Typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 1598
diff changeset
539 }
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
540 else if (INTEGERP (car) && INTEGERP (cdr))
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
541 {
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
542 /* Element (BEG . END) means range was inserted. */
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
543
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
544 if (XINT (car) < BEGV
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
545 || XINT (cdr) > ZV)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546 error ("Changes to be undone are outside visible portion of buffer");
1320
c45c4e0cae7d (Fprimitive_undo): When undoing an insert, move point and then delete.
Richard M. Stallman <rms@gnu.org>
parents: 1248
diff changeset
547 /* Set point first thing, so that undoing this undo
c45c4e0cae7d (Fprimitive_undo): When undoing an insert, move point and then delete.
Richard M. Stallman <rms@gnu.org>
parents: 1248
diff changeset
548 does not send point back to where it is now. */
c45c4e0cae7d (Fprimitive_undo): When undoing an insert, move point and then delete.
Richard M. Stallman <rms@gnu.org>
parents: 1248
diff changeset
549 Fgoto_char (car);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
550 Fdelete_region (car, cdr);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551 }
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
552 else if (EQ (car, Qapply))
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
553 {
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
554 /* Element (apply FUN . ARGS) means call FUN to undo. */
60000
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
555 struct buffer *save_buffer = current_buffer;
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
556
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
557 car = Fcar (cdr);
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
558 cdr = Fcdr (cdr);
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
559 if (INTEGERP (car))
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
560 {
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
561 /* Long format: (apply DELTA START END FUN . ARGS). */
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
562 Lisp_Object delta = car;
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
563 Lisp_Object start = Fcar (cdr);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
564 Lisp_Object end = Fcar (Fcdr (cdr));
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
565 Lisp_Object start_mark = Fcopy_marker (start, Qnil);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
566 Lisp_Object end_mark = Fcopy_marker (end, Qt);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
567
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
568 cdr = Fcdr (Fcdr (cdr));
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
569 apply1 (Fcar (cdr), Fcdr (cdr));
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
570
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
571 /* Check that the function did what the entry said it
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
572 would do. */
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
573 if (!EQ (start, Fmarker_position (start_mark))
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
574 || (XINT (delta) + XINT (end)
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
575 != marker_position (end_mark)))
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
576 error ("Changes to be undone by function different than announced");
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
577 Fset_marker (start_mark, Qnil, Qnil);
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
578 Fset_marker (end_mark, Qnil, Qnil);
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
579 }
59992
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
580 else
6e49a3404a8e (Fprimitive_undo): Check veracity of delta,start,end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59970
diff changeset
581 apply1 (car, cdr);
60000
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
582
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
583 if (save_buffer != current_buffer)
bbd61dfcbd2c (Fprimitive_undo): Check that undo function does not switch buffer.
Kim F. Storm <storm@cua.dk>
parents: 59992
diff changeset
584 error ("Undo function switched buffer");
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
585 did_apply = 1;
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
586 }
9108
c0287cefc0f8 (record_insert, truncate_undo_list, Fprimitive_undo): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents: 7671
diff changeset
587 else if (STRINGP (car) && INTEGERP (cdr))
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 {
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
589 /* Element (STRING . POS) means STRING was deleted. */
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
590 Lisp_Object membuf;
110484
7ca55779eeef Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109179
diff changeset
591 EMACS_INT pos = XINT (cdr);
544
054dfe2f6327 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
592
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
593 membuf = car;
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
594 if (pos < 0)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
595 {
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
596 if (-pos < BEGV || -pos > ZV)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
597 error ("Changes to be undone are outside visible portion of buffer");
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
598 SET_PT (-pos);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
599 Finsert (1, &membuf);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
600 }
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
601 else
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
602 {
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
603 if (pos < BEGV || pos > ZV)
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
604 error ("Changes to be undone are outside visible portion of buffer");
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
605 SET_PT (pos);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
606
17447
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
607 /* Now that we record marker adjustments
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
608 (caused by deletion) for undo,
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
609 we should always insert after markers,
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
610 so that undoing the marker adjustments
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
611 put the markers back in the right place. */
dc2cb454b330 (Fprimitive_undo): When inserting, always insert
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
612 Finsert (1, &membuf);
1248
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
613 SET_PT (pos);
68c77558d34b (record_delete): Record pos before the deletion.
Richard M. Stallman <rms@gnu.org>
parents: 970
diff changeset
614 }
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
615 }
14480
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
616 else if (MARKERP (car) && INTEGERP (cdr))
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
617 {
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
618 /* (MARKER . INTEGER) means a marker MARKER
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
619 was adjusted by INTEGER. */
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
620 if (XMARKER (car)->buffer)
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
621 Fset_marker (car,
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
622 make_number (marker_position (car) - XINT (cdr)),
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
623 Fmarker_buffer (car));
50954bb380b6 (record_marker_adjustment): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
624 }
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
626 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
627 arg--;
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
628 }
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
629
59970
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
630
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
631 /* Make sure an apply entry produces at least one undo entry,
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
632 so the test in `undo' for continuing an undo series
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
633 will work right. */
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
634 if (did_apply
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
635 && EQ (oldlist, current_buffer->undo_list))
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
636 current_buffer->undo_list
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
637 = Fcons (list3 (Qapply, Qcdr, Qnil), current_buffer->undo_list);
cf4b913c7074 (Fprimitive_undo): Record max one dummmy apply element.
Kim F. Storm <storm@cua.dk>
parents: 59864
diff changeset
638
7671
31d444fcae24 (Fprimitive_undo): GCPRO next and list.
Karl Heuer <kwzh@gnu.org>
parents: 7395
diff changeset
639 UNGCPRO;
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
640 return unbind_to (count, list);
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
641 }
59777
06bae5eee9dc (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
Richard M. Stallman <rms@gnu.org>
parents: 59069
diff changeset
642
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21272
diff changeset
643 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106815
diff changeset
644 syms_of_undo (void)
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
645 {
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
646 Qinhibit_read_only = intern_c_string ("inhibit-read-only");
3696
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
647 staticpro (&Qinhibit_read_only);
aa9310f06c0f (syms_of_undo): Set up Qinhibit_read_only.
Richard M. Stallman <rms@gnu.org>
parents: 3687
diff changeset
648
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
649 Qapply = intern_c_string ("apply");
59832
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
650 staticpro (&Qapply);
ff1b86883ff8 (Qapply): New lisp var.
Kim F. Storm <storm@cua.dk>
parents: 59793
diff changeset
651
6254
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
652 pending_boundary = Qnil;
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
653 staticpro (&pending_boundary);
a147d798ed0d (syms_of_undo): staticpro pending_boundary.
Richard M. Stallman <rms@gnu.org>
parents: 6180
diff changeset
654
93663
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
655 last_undo_buffer = NULL;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
656 last_boundary_buffer = NULL;
959f4471c16e (last_boundary_buffer, last_boundary_position): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87860
diff changeset
657
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
658 defsubr (&Sprimitive_undo);
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
659 defsubr (&Sundo_boundary);
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
660
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
661 DEFVAR_INT ("undo-limit", undo_limit,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
662 doc: /* Keep no more undo information once it exceeds this size.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
663 This limit is applied when garbage collection happens.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
664 When a previous command increases the total undo list size past this
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
665 value, the earlier commands that came before it are forgotten.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
666
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
667 The size is counted as the number of bytes occupied,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
668 which includes both saved text and other data. */);
101583
c2c9245e7699 (undo_limit, undo_strong_limit, Vundo_outer_limit): Quadruple undo
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
669 undo_limit = 80000;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
670
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
671 DEFVAR_INT ("undo-strong-limit", undo_strong_limit,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
672 doc: /* Don't keep more than this much size of undo information.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
673 This limit is applied when garbage collection happens.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
674 When a previous command increases the total undo list size past this
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
675 value, that command and the earlier commands that came before it are forgotten.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
676 However, the most recent buffer-modifying command's undo info
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
677 is never discarded for this reason.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
678
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
679 The size is counted as the number of bytes occupied,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
680 which includes both saved text and other data. */);
101583
c2c9245e7699 (undo_limit, undo_strong_limit, Vundo_outer_limit): Quadruple undo
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
681 undo_strong_limit = 120000;
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
682
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
683 DEFVAR_LISP ("undo-outer-limit", Vundo_outer_limit,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
684 doc: /* Outer limit on size of undo information for one command.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
685 At garbage collection time, if the current command has produced
59791
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
686 more than this much undo information, it discards the info and displays
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
687 a warning. This is a last-ditch limit to prevent memory overflow.
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
688
59791
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
689 The size is counted as the number of bytes occupied, which includes
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
690 both saved text and other data. A value of nil means no limit. In
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
691 this case, accumulating one huge undo entry could make Emacs crash as
fc2f566fb0fd (syms_of_undo) <undo-outer-limit>: Doc update.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59777
diff changeset
692 a result of memory overflow.
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
693
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
694 In fact, this calls the function which is the value of
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
695 `undo-outer-limit-function' with one argument, the size.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
696 The text above describes the behavior of the function
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
697 that variable usually specifies. */);
101583
c2c9245e7699 (undo_limit, undo_strong_limit, Vundo_outer_limit): Quadruple undo
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
698 Vundo_outer_limit = make_number (12000000);
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
699
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
700 DEFVAR_LISP ("undo-outer-limit-function", Vundo_outer_limit_function,
59048
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
701 doc: /* Function to call when an undo list exceeds `undo-outer-limit'.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
702 This function is called with one argument, the current undo list size
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
703 for the most recent command (since the last undo boundary).
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
704 If the function returns t, that means truncation has been fully handled.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
705 If it returns nil, the other forms of truncation are done.
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
706
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
707 Garbage collection is inhibited around the call to this function,
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
708 so it must make sure not to do a lot of consing. */);
2daab60919ed (truncate_undo_list): Return void.
Richard M. Stallman <rms@gnu.org>
parents: 55839
diff changeset
709 Vundo_outer_limit_function = Qnil;
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
710
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
711 DEFVAR_BOOL ("undo-inhibit-record-point", undo_inhibit_record_point,
87860
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
712 doc: /* Non-nil means do not record `point' in `buffer-undo-list'. */);
c250fe62d36e (undo_inhibit_record_point): New variable.
Martin Rudalics <rudalics@gmx.at>
parents: 79759
diff changeset
713 undo_inhibit_record_point = 0;
223
dbc50aaa4f08 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
714 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
715