Mercurial > hg > xemacs-beta
annotate lisp/indent.el @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | a634e3b7acc8 |
| children | 5b560b7374ff |
| rev | line source |
|---|---|
| 428 | 1 ;;; indent.el --- indentation commands for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1985, 1992, 1993, 1995, 1997 Free Software Foundation, Inc. | |
| 814 | 4 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Maintainer: FSF | |
| 7 ;; Keywords: lisp, languages, tools, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 23 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 24 ;; 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: FSF 19.30. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs. | |
| 31 | |
| 32 ;; Commands for making and changing indentation in text. These are | |
| 33 ;; described in the XEmacs Reference Manual. | |
| 34 | |
| 35 ;; 06/11/1997 - Convert (preceding|following)-char to char-(before|after) -slb | |
| 36 | |
| 37 ;;; Code: | |
| 38 | |
| 39 (defvar standard-indent 4 "\ | |
| 40 Default number of columns for margin-changing functions to indent.") | |
| 41 | |
| 42 (defvar indent-line-function 'indent-to-left-margin | |
| 43 "Function to indent current line.") | |
| 44 | |
| 45 (defun indent-according-to-mode () | |
| 46 "Indent line in proper way for current major mode." | |
| 47 (interactive) | |
| 48 (funcall indent-line-function)) | |
| 49 | |
| 50 (defun indent-for-tab-command (&optional prefix-arg) | |
| 51 "Indent line in proper way for current major mode." | |
| 52 (interactive "P") | |
| 53 (if (eq indent-line-function 'indent-to-left-margin) | |
| 54 (insert-tab prefix-arg) | |
| 55 (if prefix-arg | |
| 56 (funcall indent-line-function prefix-arg) | |
| 57 (funcall indent-line-function)))) | |
| 58 | |
| 59 (defun insert-tab (&optional prefix-arg) | |
| 60 (let ((count (prefix-numeric-value prefix-arg))) | |
| 61 (if abbrev-mode | |
| 62 (expand-abbrev)) | |
| 63 (if indent-tabs-mode | |
| 64 (insert-char ?\t count) | |
| 65 ;; XEmacs: (Need the `1+') | |
| 66 (indent-to (* tab-width (1+ (/ (current-column) tab-width))))))) | |
| 67 | |
| 444 | 68 (defun indent-rigidly (start end count) |
| 69 "Indent all lines starting in the region sideways by COUNT columns. | |
| 70 Called from a program, takes three arguments, START, END and COUNT." | |
| 428 | 71 (interactive "r\np") |
| 72 (save-excursion | |
| 73 (goto-char end) | |
| 74 (setq end (point-marker)) | |
| 75 (goto-char start) | |
| 76 (or (bolp) (forward-line 1)) | |
| 77 (while (< (point) end) | |
| 78 (let ((indent (current-indentation)) | |
| 79 eol-flag) | |
| 80 (save-excursion | |
| 81 (skip-chars-forward " \t") | |
| 82 (setq eol-flag (eolp))) | |
| 83 (or eol-flag | |
| 444 | 84 (indent-to (max 0 (+ indent count)) 0)) |
| 428 | 85 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) |
| 86 (forward-line 1)) | |
| 87 (move-marker end nil) | |
| 88 (setq zmacs-region-stays nil))) ; XEmacs | |
| 89 | |
| 90 (defun indent-line-to (column) | |
| 91 "Indent current line to COLUMN. | |
| 92 This function removes or adds spaces and tabs at beginning of line | |
| 93 only if necessary. It leaves point at end of indentation." | |
| 94 (back-to-indentation) | |
| 95 (let ((cur-col (current-column))) | |
| 96 (cond ((< cur-col column) | |
| 97 (if (>= (- column (* (/ cur-col tab-width) tab-width)) tab-width) | |
| 98 (delete-region (point) | |
| 99 (progn (skip-chars-backward " ") (point)))) | |
| 100 (indent-to column)) | |
| 101 ((> cur-col column) ; too far right (after tab?) | |
| 102 (delete-region (progn (move-to-column column t) (point)) | |
| 103 (progn (back-to-indentation) (point))))))) | |
| 104 | |
| 105 (defun current-left-margin () | |
| 106 "Return the left margin to use for this line. | |
| 107 This is the value of the buffer-local variable `left-margin' plus the value | |
| 108 of the `left-margin' text-property at the start of the line." | |
| 109 (save-excursion | |
| 110 (back-to-indentation) | |
| 111 (max 0 | |
| 112 (+ left-margin (or (get-text-property | |
| 113 (if (and (eobp) (not (bobp))) | |
| 114 (1- (point)) (point)) | |
| 115 'left-margin) 0))))) | |
| 116 | |
| 117 (defun move-to-left-margin (&optional n force) | |
| 118 "Move to the left margin of the current line. | |
| 119 With optional argument, move forward N-1 lines first. | |
| 120 The column moved to is the one given by the `current-left-margin' function. | |
| 121 If the line's indentation appears to be wrong, and this command is called | |
| 122 interactively or with optional argument FORCE, it will be fixed." | |
| 123 (interactive (list (prefix-numeric-value current-prefix-arg) t)) | |
| 124 (beginning-of-line n) | |
| 125 (skip-chars-forward " \t") | |
| 126 (let ((lm (current-left-margin)) | |
| 127 (cc (current-column))) | |
| 128 (cond ((> cc lm) | |
| 129 (if (> (move-to-column lm force) lm) | |
| 130 ;; If lm is in a tab and we are not forcing, move before tab | |
| 131 (backward-char 1))) | |
| 132 ((and force (< cc lm)) | |
| 133 (indent-to-left-margin))))) | |
| 134 | |
| 135 ;; This is the default indent-line-function, | |
| 136 ;; used in Fundamental Mode, Text Mode, etc. | |
| 137 (defun indent-to-left-margin () | |
| 138 "Indent current line to the column given by `current-left-margin'." | |
| 139 (indent-line-to (current-left-margin))) | |
| 140 | |
| 141 (defun delete-to-left-margin (&optional from to) | |
| 142 "Remove left margin indentation from a region. | |
| 444 | 143 The amount of indentation to delete is determined by calling the |
| 144 function `current-left-margin'. | |
| 428 | 145 In no case will it delete non-whitespace. |
| 146 Args FROM and TO are optional; default is the whole buffer." | |
| 147 (save-excursion | |
| 148 (goto-char (or to (point-max))) | |
| 149 (setq to (point-marker)) | |
| 150 (goto-char (or from (point-min))) | |
| 151 (or (bolp) (forward-line 1)) | |
| 152 (while (< (point) to) | |
| 153 (delete-region (point) (progn (move-to-left-margin nil t) (point))) | |
| 154 (forward-line 1)) | |
| 155 (move-marker to nil))) | |
| 156 | |
| 157 (defun set-left-margin (from to lm) | |
| 158 "Set the left margin of the region to WIDTH. | |
| 159 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 160 (interactive "r\nNSet left margin to column: ") | |
| 161 (if (interactive-p) (setq lm (prefix-numeric-value lm))) | |
| 162 (save-excursion | |
| 163 ;; If inside indentation, start from BOL. | |
| 164 (goto-char from) | |
| 165 (skip-chars-backward " \t") | |
| 166 (if (bolp) (setq from (point))) | |
| 167 ;; Place end after whitespace | |
| 168 (goto-char to) | |
| 169 (skip-chars-forward " \t") | |
| 170 (setq to (point-marker))) | |
| 171 ;; Delete margin indentation first, but keep paragraph indentation. | |
| 172 (delete-to-left-margin from to) | |
| 173 (put-text-property from to 'left-margin lm) | |
| 174 (indent-rigidly from to lm) | |
| 175 (if auto-fill-function (save-excursion (fill-region from to nil t t))) | |
| 176 (move-marker to nil)) | |
| 177 | |
| 178 (defun set-right-margin (from to lm) | |
| 179 "Set the right margin of the region to WIDTH. | |
| 180 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 181 (interactive "r\nNSet right margin to width: ") | |
| 182 (if (interactive-p) (setq lm (prefix-numeric-value lm))) | |
| 183 (save-excursion | |
| 184 (goto-char from) | |
| 185 (skip-chars-backward " \t") | |
| 186 (if (bolp) (setq from (point)))) | |
| 187 (put-text-property from to 'right-margin lm) | |
| 188 (if auto-fill-function (save-excursion (fill-region from to nil t t)))) | |
| 189 | |
| 190 (defun alter-text-property (from to prop func &optional object) | |
| 191 "Programmatically change value of a text-property. | |
| 192 For each region between FROM and TO that has a single value for PROPERTY, | |
| 193 apply FUNCTION to that value and sets the property to the function's result. | |
| 194 Optional fifth argument OBJECT specifies the string or buffer to operate on." | |
| 195 (let ((begin from) | |
| 196 end val) | |
| 197 (while (setq val (get-text-property begin prop object) | |
| 198 end (text-property-not-all begin to prop val object)) | |
| 199 (put-text-property begin end prop (funcall func val) object) | |
| 200 (setq begin end)) | |
| 201 (if (< begin to) | |
| 202 (put-text-property begin to prop (funcall func val) object)))) | |
| 203 | |
| 204 (defun increase-left-margin (from to inc) | |
| 205 "Increase or decrease the left-margin of the region. | |
| 206 With no prefix argument, this adds `standard-indent' of indentation. | |
| 207 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 208 to change the margin by, in characters. | |
| 209 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 210 (interactive "*r\nP") | |
| 211 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 212 (save-excursion | |
| 213 (goto-char from) | |
| 214 (skip-chars-backward " \t") | |
| 215 (if (bolp) (setq from (point))) | |
| 216 (goto-char to) | |
| 217 (setq to (point-marker))) | |
| 218 (alter-text-property from (marker-position to) 'left-margin ; XEmacs | |
| 219 (lambda (v) (max (- left-margin) (+ inc (or v 0))))) | |
| 220 (indent-rigidly from (marker-position to) inc) ; XEmacs | |
| 221 (if auto-fill-function | |
| 222 (save-excursion | |
| 223 (fill-region from (marker-position to) nil t t))) ; XEmacs | |
| 224 (move-marker to nil)) | |
| 225 | |
| 226 (defun decrease-left-margin (from to inc) | |
| 227 "Make the left margin of the region smaller. | |
| 228 With no prefix argument, decrease the indentation by `standard-indent'. | |
| 229 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 230 to change the margin by, in characters. | |
| 231 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 232 (interactive "*r\nP") | |
| 233 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 234 (increase-left-margin from to (- inc))) | |
| 235 | |
| 236 (defun increase-right-margin (from to inc) | |
| 237 "Increase the right-margin of the region. | |
| 238 With no prefix argument, increase the right margin by `standard-indent'. | |
| 239 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 240 to change the margin by, in characters. A negative argument decreases | |
| 241 the right margin width. | |
| 242 If `auto-fill-mode' is active, re-fill the region to fit the new margin." | |
| 243 (interactive "r\nP") | |
| 244 (if (interactive-p) | |
| 245 (setq inc (if inc (prefix-numeric-value current-prefix-arg) | |
| 246 standard-indent))) | |
| 247 (save-excursion | |
| 248 (alter-text-property from to 'right-margin | |
| 249 (lambda (v) (+ inc (or v 0)))) | |
| 250 (if auto-fill-function | |
| 251 (fill-region from to nil t t)))) | |
| 252 | |
| 253 (defun decrease-right-margin (from to inc) | |
| 254 "Make the right margin of the region smaller. | |
| 255 With no prefix argument, decrease the right margin by `standard-indent'. | |
| 256 A prefix arg (optional third arg INC noninteractively) specifies the amount | |
| 257 of width to remove, in characters. A negative argument increases | |
| 258 the right margin width. | |
| 259 If `auto-fill-mode' is active, re-fills region to fit in new margin." | |
| 260 (interactive "*r\nP") | |
| 261 (setq inc (if inc (prefix-numeric-value inc) standard-indent)) | |
| 262 (increase-right-margin from to (- inc))) | |
| 263 | |
| 264 (defun beginning-of-line-text (&optional n) | |
| 265 "Move to the beginning of the text on this line. | |
| 266 With optional argument, move forward N-1 lines first. | |
| 267 From the beginning of the line, moves past the left-margin indentation, the | |
| 268 fill-prefix, and any indentation used for centering or right-justifying the | |
| 444 | 269 line, but does not move past any whitespace that was explicitly inserted |
| 428 | 270 \(such as a tab used to indent the first line of a paragraph)." |
| 271 (interactive "p") | |
| 272 (beginning-of-line n) | |
| 273 (skip-chars-forward " \t") | |
| 274 ;; Skip over fill-prefix. | |
| 444 | 275 (if (and fill-prefix |
| 428 | 276 (not (string-equal fill-prefix ""))) |
| 277 (if (equal fill-prefix | |
| 444 | 278 (buffer-substring |
| 428 | 279 (point) (min (point-max) (+ (length fill-prefix) (point))))) |
| 280 (forward-char (length fill-prefix))) | |
| 281 (if (and adaptive-fill-mode adaptive-fill-regexp | |
| 282 (looking-at adaptive-fill-regexp)) | |
| 283 (goto-char (match-end 0)))) | |
| 284 ;; Skip centering or flushright indentation | |
| 285 (if (memq (current-justification) '(center right)) | |
| 286 (skip-chars-forward " \t"))) | |
| 287 | |
| 288 (defvar indent-region-function nil | |
| 289 "Short cut function to indent region using `indent-according-to-mode'. | |
| 290 A value of nil means really run `indent-according-to-mode' on each line.") | |
| 291 | |
| 292 (defun indent-region (start end column) | |
| 293 "Indent each nonblank line in the region. | |
| 294 With no argument, indent each line using `indent-according-to-mode', | |
| 295 or use `indent-region-function' to do the whole region if that's non-nil. | |
| 296 If there is a fill prefix, make each line start with the fill prefix. | |
| 297 With argument COLUMN, indent each line to that column. | |
| 298 Called from a program, takes three args: START, END and COLUMN." | |
| 299 (interactive "r\nP") | |
| 300 (if (null column) | |
| 301 (if fill-prefix | |
| 302 (save-excursion | |
| 303 (goto-char end) | |
| 304 (setq end (point-marker)) | |
| 305 (goto-char start) | |
| 306 (let ((regexp (regexp-quote fill-prefix))) | |
| 307 (while (< (point) end) | |
| 308 (or (looking-at regexp) | |
| 309 (and (bolp) (eolp)) | |
| 310 (insert fill-prefix)) | |
| 311 (forward-line 1)))) | |
| 312 (if indent-region-function | |
| 313 (funcall indent-region-function start end) | |
| 314 (save-excursion | |
| 315 (goto-char end) | |
| 316 (setq end (point-marker)) | |
| 317 (goto-char start) | |
| 318 (or (bolp) (forward-line 1)) | |
| 319 (while (< (point) end) | |
| 320 (or (and (bolp) (eolp)) | |
| 321 (funcall indent-line-function)) | |
| 322 (forward-line 1)) | |
| 323 (move-marker end nil)))) | |
| 324 (setq column (prefix-numeric-value column)) | |
| 325 (save-excursion | |
| 326 (goto-char end) | |
| 327 (setq end (point-marker)) | |
| 328 (goto-char start) | |
| 329 (or (bolp) (forward-line 1)) | |
| 330 (while (< (point) end) | |
| 331 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
| 332 (or (eolp) | |
| 333 (indent-to column 0)) | |
| 334 (forward-line 1)) | |
| 335 (move-marker end nil)))) | |
| 336 | |
| 814 | 337 (defvar indent-balanced-expression-function nil |
| 338 "Short cut function to indent balanced expression. | |
| 339 A value of nil means really run `indent-according-to-mode' on each line of | |
| 340 balanced expression as computed with `forward-sexp'.") | |
| 341 | |
| 342 (defun indent-balanced-expression () | |
| 343 "Indent each nonblank line in the balanced expression at point. | |
| 344 Use `indent-balanced-expression-function' if that's non-nil, or find | |
| 345 expression with `forward-sexp' and use `indent-region' on result." | |
| 346 (interactive "") | |
| 347 (let ((fun (or indent-balanced-expression-function | |
| 348 (cond ((memq major-mode '(c-mode c++-mode java-mode objc-mode | |
| 349 idl-mode pike-mode | |
| 350 c++-c-mode elec-c-mode)) | |
| 351 'c-indent-exp) | |
| 352 ((memq major-mode | |
| 353 '(lisp-mode | |
| 354 emacs-lisp-mode lisp-interaction-mode | |
| 355 scheme-mode inferior-scheme-mode | |
| 356 scheme-interaction-mode)) | |
| 357 'indent-sexp))))) | |
| 358 (if fun (funcall fun) | |
| 359 (let ((end (save-excursion (forward-sexp) (point)))) | |
| 360 (indent-region (point) end nil))))) | |
| 361 | |
| 362 (defun indent-region-or-balanced-expression () | |
| 363 "Indent region if active, or balanced expression at point. | |
| 364 See `indent-region' and `indent-balanced-expression'." | |
| 365 (interactive "") | |
| 366 (if (region-active-p) | |
| 367 (indent-region (region-beginning) (region-end) nil) | |
| 368 (indent-balanced-expression))) | |
| 369 | |
| 428 | 370 (defun indent-relative-maybe () |
| 371 "Indent a new line like previous nonblank line." | |
| 372 (interactive) | |
| 373 (indent-relative t)) | |
| 374 | |
| 375 (defun indent-relative (&optional unindented-ok) | |
| 376 "Space out to under next indent point in previous nonblank line. | |
| 377 An indent point is a non-whitespace character following whitespace. | |
| 378 If the previous nonblank line has no indent points beyond the | |
| 379 column point starts at, `tab-to-tab-stop' is done instead." | |
| 380 (interactive "P") | |
| 381 (if abbrev-mode (expand-abbrev)) | |
| 382 (let ((start-column (current-column)) | |
| 383 indent) | |
| 384 (save-excursion | |
| 385 (beginning-of-line) | |
| 386 (if (re-search-backward "^[^\n]" nil t) | |
| 387 (let ((end (save-excursion (forward-line 1) (point)))) | |
| 388 (move-to-column start-column) | |
| 389 ;; Is start-column inside a tab on this line? | |
| 390 (if (> (current-column) start-column) | |
| 391 (backward-char 1)) | |
| 392 (or (looking-at "[ \t]") | |
| 393 unindented-ok | |
| 394 (skip-chars-forward "^ \t" end)) | |
| 395 (skip-chars-forward " \t" end) | |
| 396 (or (= (point) end) (setq indent (current-column)))))) | |
| 397 (if indent | |
| 398 (let ((opoint (point-marker))) | |
| 399 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
| 400 (indent-to indent 0) | |
| 401 (if (> opoint (point)) | |
| 402 (goto-char opoint)) | |
| 403 (move-marker opoint nil)) | |
| 404 (tab-to-tab-stop)))) | |
| 405 | |
| 406 (defvar tab-stop-list | |
| 407 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120) | |
| 408 "*List of tab stop positions used by `tab-to-tab-stops'. | |
| 409 This should be a list of integers, ordered from smallest to largest.") | |
| 410 | |
| 411 (defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.") | |
| 412 (if edit-tab-stops-map | |
| 413 nil | |
| 414 (setq edit-tab-stops-map (make-sparse-keymap)) | |
| 415 (define-key edit-tab-stops-map "\C-x\C-s" 'edit-tab-stops-note-changes) | |
| 416 (define-key edit-tab-stops-map "\C-c\C-c" 'edit-tab-stops-note-changes)) | |
| 417 | |
| 418 (defvar edit-tab-stops-buffer nil | |
| 419 "Buffer whose tab stops are being edited--in case | |
| 420 the variable `tab-stop-list' is local in that buffer.") | |
| 421 | |
| 422 (defun edit-tab-stops () | |
| 423 "Edit the tab stops used by `tab-to-tab-stop'. | |
| 424 Creates a buffer *Tab Stops* containing text describing the tab stops. | |
| 425 A colon indicates a column where there is a tab stop. | |
| 426 You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes] to make changes take effect." | |
| 427 (interactive) | |
| 428 (setq edit-tab-stops-buffer (current-buffer)) | |
| 429 (switch-to-buffer (get-buffer-create "*Tab Stops*")) | |
| 430 ;; #### I18N3 should mark buffer as output-translating | |
| 431 (use-local-map edit-tab-stops-map) | |
| 432 (make-local-variable 'indent-tabs-mode) | |
| 433 (setq indent-tabs-mode nil) | |
| 434 (overwrite-mode 1) | |
| 435 (setq truncate-lines t) | |
| 436 (erase-buffer) | |
| 437 (let ((tabs tab-stop-list)) | |
| 438 (while tabs | |
| 439 (indent-to (car tabs) 0) | |
| 440 (insert ?:) | |
| 441 (setq tabs (cdr tabs)))) | |
| 442 (let ((count 0)) | |
| 443 (insert ?\n) | |
| 444 (while (< count 8) | |
| 445 (insert (+ count ?0)) | |
| 446 (insert " ") | |
| 447 (setq count (1+ count))) | |
| 448 (insert ?\n) | |
| 449 (while (> count 0) | |
| 450 (insert "0123456789") | |
| 451 (setq count (1- count)))) | |
| 452 ;; XEmacs | |
| 453 (insert (substitute-command-keys "\nTo install changes, type \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes]")) | |
| 454 (goto-char (point-min))) | |
| 455 | |
| 456 (defun edit-tab-stops-note-changes () | |
| 457 "Put edited tab stops into effect." | |
| 458 (interactive) | |
| 459 (let (tabs) | |
| 460 (save-excursion | |
| 461 (goto-char 1) | |
| 462 (end-of-line) | |
| 463 (while (search-backward ":" nil t) | |
| 464 (setq tabs (cons (current-column) tabs)))) | |
| 465 (bury-buffer (prog1 (current-buffer) | |
| 466 (switch-to-buffer edit-tab-stops-buffer))) | |
| 467 (setq tab-stop-list tabs)) | |
| 468 (message "Tab stops installed")) | |
| 469 | |
| 470 (defun tab-to-tab-stop () | |
| 471 "Insert spaces or tabs to next defined tab-stop column. | |
| 472 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
| 473 Use \\[edit-tab-stops] to edit them interactively." | |
| 474 (interactive) | |
| 475 (and abbrev-mode (eq (char-syntax (char-before (point))) ?w) | |
| 476 (expand-abbrev)) | |
| 477 (let ((tabs tab-stop-list)) | |
| 478 (while (and tabs (>= (current-column) (car tabs))) | |
| 479 (setq tabs (cdr tabs))) | |
| 480 (if tabs | |
| 481 (let ((opoint (point))) | |
| 482 (skip-chars-backward " \t") | |
| 483 (delete-region (point) opoint) | |
| 484 (indent-to (car tabs))) | |
| 485 (insert ?\ )))) | |
| 486 | |
| 487 (defun move-to-tab-stop () | |
| 488 "Move point to next defined tab-stop column. | |
| 489 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
| 490 Use \\[edit-tab-stops] to edit them interactively." | |
| 491 (interactive) | |
| 492 (let ((tabs tab-stop-list)) | |
| 493 (while (and tabs (>= (current-column) (car tabs))) | |
| 494 (setq tabs (cdr tabs))) | |
| 495 (if tabs | |
| 496 (let ((before (point))) | |
| 497 (move-to-column (car tabs) t) | |
| 498 (save-excursion | |
| 499 (goto-char before) | |
| 500 ;; If we just added a tab, or moved over one, | |
| 501 ;; delete any superfluous spaces before the old point. | |
| 502 (if (and (eq (char-before (point)) ?\ ) | |
| 503 (eq (char-after (point)) ?\t)) | |
| 504 (let ((tabend (* (/ (current-column) tab-width) tab-width))) | |
| 505 (while (and (> (current-column) tabend) | |
| 506 (eq (char-before (point)) ?\ )) | |
| 446 | 507 (backward-char 1)) |
| 428 | 508 (delete-region (point) before)))))))) |
| 509 | |
| 510 ;(define-key global-map "\t" 'indent-for-tab-command) | |
| 511 ;(define-key esc-map "\034" 'indent-region) | |
| 512 ;(define-key ctl-x-map "\t" 'indent-rigidly) | |
| 513 ;(define-key esc-map "i" 'tab-to-tab-stop) | |
| 514 | |
| 515 ;;; indent.el ends here |