Mercurial > hg > xemacs-beta
annotate lisp/x-compose.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 | 3ecd8885ac67 |
| children | a25c824ed558 |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-compose.el --- Compose-key processing in XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Author: Jamie Zawinski <jwz@jwz.org> | |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Rewritten by Martin Buchholz far too many times. | |
| 8 ;; | |
| 9 ;; Changed: 11 Jun 1997 by Heiko Muenkel <muenkel@tnt.uni-hannover.de> | |
| 10 ;; The degree sign couldn't be inserted with the old version. | |
| 11 ;; Keywords: i18n | |
| 12 | |
| 13 ;; This file is part of XEmacs. | |
| 14 | |
| 15 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 16 ;; under the terms of the GNU General Public License as published by | |
| 17 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 18 ;; any later version. | |
| 19 | |
| 20 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 21 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 23 ;; General Public License for more details. | |
| 24 | |
| 25 ;; You should have received a copy of the GNU General Public License | |
| 26 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 27 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 28 ;; Boston, MA 02111-1307, USA. | |
| 29 | |
| 30 ;;; Synched up with: Not in FSF. | |
| 31 | |
| 32 ;;; Commentary: | |
| 33 | |
| 34 ;; created by jwz, 14-jun-92. | |
| 35 ;;; changed by Jan Vroonhof, July 1997: Use function-key-map instead | |
| 36 ;;; of global map. | |
| 37 ;;; Preliminary support for | |
| 38 ;;; XFree86 deadkeys | |
| 39 | |
| 40 ;; This file implements DEC-, OpenWindows-, and HP-compatible "Compose" | |
| 41 ;; processing for XEmacs. | |
| 42 | |
| 43 ;; If you are running a version of X which already does compose processing, | |
| 44 ;; then you don't need this file. But the MIT R4 and R5 distributions don't | |
| 45 ;; do compose processing, so you may want to fake it by using this code. | |
| 46 | |
| 47 ;; The basic idea is that there are several ways to generate keysyms which | |
| 48 ;; do not have keys devoted to them on your keyboard. | |
| 49 | |
| 50 ;; The first method is by using "dead" keys. A dead key is a key which, | |
| 51 ;; when typed, does not insert a character. Instead it modifies the | |
| 52 ;; following character typed. So if you typed "dead-tilde" followed by "A", | |
| 53 ;; then "A-tilde" would be inserted. Of course, this requires you to modify | |
| 54 ;; your keyboard to include a "dead-tilde" key on it somewhere. | |
| 55 | |
| 56 ;; The second method is by using a "Compose" key. With a Compose key, you | |
| 57 ;; would type "Compose" then "tilde" then "A" to insert "A-tilde". | |
| 58 | |
| 59 ;; There are a small number of dead keys: acute, grave, cedilla, diaeresis, | |
| 60 ;; circumflex, tilde, and ring. There are a larger number of accented and | |
| 61 ;; other characters accessible via the Compose key, so both are useful. | |
| 62 | |
| 63 ;; To use this code, you will need to have a Compose key on your keyboard. | |
| 64 ;; The default configuration of most X keyboards doesn't contain one. You | |
| 65 ;; can, for example, turn the right "Meta" key into a "Compose" key with | |
| 66 ;; this command: | |
| 67 | |
| 68 ;; xmodmap -e "remove mod1 = Meta_R" -e "keysym Meta_R = Multi_key" | |
| 69 | |
| 70 ;; Multi-key is the name that X (and emacs) know the "Compose" key by. | |
| 71 ;; The "remove..." command is necessary because the "Compose" key must not | |
| 72 ;; have any modifier bits associated with it. This exact command may not | |
| 73 ;; work, depending on what system and keyboard you are using. If it | |
| 74 ;; doesn't, you'll have to read the man page for xmodmap. You might want | |
| 75 ;; to get the "xkeycaps" program from | |
| 76 ;; <URL:http://www.jwz.org/xkeycaps/>, | |
| 77 ;; which is a graphical front end to xmodmap | |
| 78 ;; that hides xmodmap's arcane syntax from you. | |
| 79 | |
| 80 ;; If for some reason you don't want to have a dedicated compose key on your | |
| 81 ;; keyboard, you can use some other key as the prefix. For example, to make | |
| 82 ;; "Meta-Shift-C" act as a compose key (so that "M-C , c" would insert the | |
| 83 ;; character "ccedilla") you could do | |
| 84 | |
| 85 ;; (global-set-key "\M-C" compose-map) | |
| 86 | |
| 87 ;; I believe the bindings encoded in this file are the same as those used | |
| 88 ;; by OpenWindows versions 2 and 3, and DEC VT320 terminals. Please let me | |
| 89 ;; know if you think otherwise. | |
| 90 | |
| 91 ;; Much thanks to Justin Bur <justin@crim.ca> for helping me understand how | |
| 92 ;; this stuff is supposed to work. | |
| 93 | |
| 94 ;; You also might want to consider getting Justin's patch for the MIT Xlib | |
| 95 ;; that implements compose processing in the library. This will enable | |
| 96 ;; compose processing in applications other than emacs as well. You can | |
| 97 ;; get it from export.lcs.mit.edu in contrib/compose.tar.Z. | |
| 98 | |
| 99 ;; This code has one feature that a more "builtin" Compose mechanism could | |
| 100 ;; not have: at any point you can type C-h to get a list of the possible | |
| 101 ;; completions of what you have typed so far. | |
| 102 | |
| 103 ;;; Code: | |
| 104 | |
| 105 (require 'x-iso8859-1) | |
| 106 | |
| 107 (macrolet | |
| 108 ((define-compose-map (keymap-symbol) | |
| 109 `(progn | |
| 110 (defconst ,keymap-symbol (make-sparse-keymap ',keymap-symbol)) | |
| 111 ;; Required to tell XEmacs the keymaps were actually autoloaded. | |
| 112 ;; #### Make this unnecessary! | |
| 113 (fset ',keymap-symbol ,keymap-symbol)))) | |
| 114 | |
| 115 (define-compose-map compose-map) | |
| 116 (define-compose-map compose-acute-map) | |
| 117 (define-compose-map compose-grave-map) | |
| 118 (define-compose-map compose-cedilla-map) | |
| 119 (define-compose-map compose-diaeresis-map) | |
| 120 (define-compose-map compose-circumflex-map) | |
| 121 (define-compose-map compose-tilde-map) | |
| 122 (define-compose-map compose-ring-map)) | |
| 123 | |
| 124 (define-key compose-map 'acute compose-acute-map) | |
| 125 (define-key compose-map 'grave compose-grave-map) | |
| 126 (define-key compose-map 'cedilla compose-cedilla-map) | |
| 127 (define-key compose-map 'diaeresis compose-diaeresis-map) | |
| 128 (define-key compose-map 'circumflex compose-circumflex-map) | |
| 129 (define-key compose-map 'tilde compose-tilde-map) | |
| 130 (define-key compose-map 'degree compose-ring-map) | |
| 131 | |
| 132 ;;(define-key function-key-map [multi-key] compose-map) | |
| 133 | |
| 134 ;; The following is necessary, because one can't rebind [degree] | |
| 135 ;; and use it to insert the degree sign! | |
| 136 ;;(defun compose-insert-degree () | |
| 137 ;; "Inserts a degree sign." | |
| 138 ;; (interactive) | |
| 139 ;; (insert ?\260)) | |
| 140 | |
| 141 (define-key compose-map [acute] compose-acute-map) | |
| 142 (define-key compose-map [?'] compose-acute-map) | |
| 143 (define-key compose-map [grave] compose-grave-map) | |
| 144 (define-key compose-map [?`] compose-grave-map) | |
| 145 (define-key compose-map [cedilla] compose-cedilla-map) | |
| 146 (define-key compose-map [?,] compose-cedilla-map) | |
| 147 (define-key compose-map [diaeresis] compose-diaeresis-map) | |
| 148 (define-key compose-map [?\"] compose-diaeresis-map) | |
| 149 (define-key compose-map [circumflex] compose-circumflex-map) | |
| 150 (define-key compose-map [?^] compose-circumflex-map) | |
| 151 (define-key compose-map [tilde] compose-tilde-map) | |
| 152 (define-key compose-map [~] compose-tilde-map) | |
| 153 (define-key compose-map [degree] compose-ring-map) | |
| 154 (define-key compose-map [?*] compose-ring-map) | |
| 155 | |
| 156 | |
| 157 ;;; The contents of the "dead key" maps. These are shared by the | |
| 158 ;;; compose-map. | |
| 159 | |
| 160 (define-key compose-acute-map [space] "'") | |
| 161 (define-key compose-acute-map [?'] [acute]) | |
| 162 (define-key compose-acute-map [?A] [Aacute]) | |
| 163 (define-key compose-acute-map [E] [Eacute]) | |
| 164 (define-key compose-acute-map [I] [Iacute]) | |
| 165 (define-key compose-acute-map [O] [Oacute]) | |
| 166 (define-key compose-acute-map [U] [Uacute]) | |
| 167 (define-key compose-acute-map [Y] [Yacute]) | |
| 168 (define-key compose-acute-map [a] [aacute]) | |
| 169 (define-key compose-acute-map [e] [eacute]) | |
| 170 (define-key compose-acute-map [i] [iacute]) | |
| 171 (define-key compose-acute-map [o] [oacute]) | |
| 172 (define-key compose-acute-map [u] [uacute]) | |
| 173 (define-key compose-acute-map [y] [yacute]) | |
| 174 | |
| 175 (define-key compose-grave-map [space] "`") | |
| 176 (define-key compose-grave-map [?`] [grave]) | |
| 177 (define-key compose-grave-map [A] [Agrave]) | |
| 178 (define-key compose-grave-map [E] [Egrave]) | |
| 179 (define-key compose-grave-map [I] [Igrave]) | |
| 180 (define-key compose-grave-map [O] [Ograve]) | |
| 181 (define-key compose-grave-map [U] [Ugrave]) | |
| 182 (define-key compose-grave-map [a] [agrave]) | |
| 183 (define-key compose-grave-map [e] [egrave]) | |
| 184 (define-key compose-grave-map [i] [igrave]) | |
| 185 (define-key compose-grave-map [o] [ograve]) | |
| 186 (define-key compose-grave-map [u] [ugrave]) | |
| 187 | |
| 188 (define-key compose-cedilla-map [space] ",") | |
| 189 (define-key compose-cedilla-map [?,] [cedilla]) | |
| 190 (define-key compose-cedilla-map [C] [Ccedilla]) | |
| 191 (define-key compose-cedilla-map [c] [ccedilla]) | |
| 192 | |
| 193 (define-key compose-diaeresis-map [space] [diaeresis]) | |
| 194 (define-key compose-diaeresis-map [?\"] [diaeresis]) | |
| 195 (define-key compose-diaeresis-map [A] [Adiaeresis]) | |
| 196 (define-key compose-diaeresis-map [E] [Ediaeresis]) | |
| 197 (define-key compose-diaeresis-map [I] [Idiaeresis]) | |
| 198 (define-key compose-diaeresis-map [O] [Odiaeresis]) | |
| 199 (define-key compose-diaeresis-map [U] [Udiaeresis]) | |
| 200 (define-key compose-diaeresis-map [a] [adiaeresis]) | |
| 201 (define-key compose-diaeresis-map [e] [ediaeresis]) | |
| 202 (define-key compose-diaeresis-map [i] [idiaeresis]) | |
| 203 (define-key compose-diaeresis-map [o] [odiaeresis]) | |
| 204 (define-key compose-diaeresis-map [u] [udiaeresis]) | |
| 205 (define-key compose-diaeresis-map [y] [ydiaeresis]) | |
| 206 | |
| 207 (define-key compose-circumflex-map [space] "^") | |
| 208 (define-key compose-circumflex-map [?/] "|") | |
| 209 (define-key compose-circumflex-map [?!] [brokenbar]) | |
| 210 (define-key compose-circumflex-map [?-] [macron]) | |
| 211 (define-key compose-circumflex-map [?_] [macron]) | |
| 212 (define-key compose-circumflex-map [?0] [degree]) | |
| 213 (define-key compose-circumflex-map [?1] [onesuperior]) | |
| 214 (define-key compose-circumflex-map [?2] [twosuperior]) | |
| 215 (define-key compose-circumflex-map [?3] [threesuperior]) | |
| 216 (define-key compose-circumflex-map [?.] [periodcentered]) | |
| 217 (define-key compose-circumflex-map [A] [Acircumflex]) | |
| 218 (define-key compose-circumflex-map [E] [Ecircumflex]) | |
| 219 (define-key compose-circumflex-map [I] [Icircumflex]) | |
| 220 (define-key compose-circumflex-map [O] [Ocircumflex]) | |
| 221 (define-key compose-circumflex-map [U] [Ucircumflex]) | |
| 222 (define-key compose-circumflex-map [a] [acircumflex]) | |
| 223 (define-key compose-circumflex-map [e] [ecircumflex]) | |
| 224 (define-key compose-circumflex-map [i] [icircumflex]) | |
| 225 (define-key compose-circumflex-map [o] [ocircumflex]) | |
| 226 (define-key compose-circumflex-map [u] [ucircumflex]) | |
| 227 | |
| 228 (define-key compose-tilde-map [space] "~") | |
| 229 (define-key compose-tilde-map [A] [Atilde]) | |
| 230 (define-key compose-tilde-map [N] [Ntilde]) | |
| 231 (define-key compose-tilde-map [O] [Otilde]) | |
| 232 (define-key compose-tilde-map [a] [atilde]) | |
| 233 (define-key compose-tilde-map [n] [ntilde]) | |
| 234 (define-key compose-tilde-map [o] [otilde]) | |
| 235 | |
| 236 (define-key compose-ring-map [space] [degree]) | |
| 237 (define-key compose-ring-map [A] [Aring]) | |
| 238 (define-key compose-ring-map [a] [aring]) | |
| 239 | |
| 240 | |
| 241 ;;; The rest of the compose-map. These are the composed characters | |
| 242 ;;; that are not accessible via "dead" keys. | |
| 243 | |
| 244 (define-key compose-map " '" "'") | |
| 245 (define-key compose-map " ^" "^") | |
| 246 (define-key compose-map " `" "`") | |
| 247 (define-key compose-map " ~" "~") | |
| 248 (define-key compose-map " " [nobreakspace]) | |
| 249 (define-key compose-map " \"" [diaeresis]) | |
| 250 (define-key compose-map " :" [diaeresis]) | |
| 251 (define-key compose-map " *" [degree]) | |
| 252 | |
| 253 (define-key compose-map "!!" [exclamdown]) | |
| 254 (define-key compose-map "!^" [brokenbar]) | |
| 255 (define-key compose-map "!S" [section]) | |
| 256 (define-key compose-map "!s" [section]) | |
| 257 (define-key compose-map "!P" [paragraph]) | |
| 258 (define-key compose-map "!p" [paragraph]) | |
| 259 | |
| 260 (define-key compose-map "((" "[") | |
| 261 (define-key compose-map "(-" "{") | |
| 262 | |
| 263 (define-key compose-map "))" "]") | |
| 264 (define-key compose-map ")-" "}") | |
| 265 | |
| 266 (define-key compose-map "++" "#") | |
| 267 (define-key compose-map "+-" [plusminus]) | |
| 268 | |
| 269 (define-key compose-map "-(" "{") | |
| 270 (define-key compose-map "-)" "}") | |
| 271 (define-key compose-map "--" "-") | |
| 272 (define-key compose-map "-L" [sterling]) | |
| 273 (define-key compose-map "-l" [sterling]) | |
| 274 (define-key compose-map "-Y" [yen]) | |
| 275 (define-key compose-map "-y" [yen]) | |
| 276 (define-key compose-map "-," [notsign]) | |
| 277 (define-key compose-map "-|" [notsign]) | |
| 278 (define-key compose-map "-^" [macron]) | |
| 279 (define-key compose-map "-+" [plusminus]) | |
| 280 (define-key compose-map "-:" [division]) | |
| 281 (define-key compose-map "-D" [ETH]) | |
| 282 (define-key compose-map "-d" [eth]) | |
| 283 (define-key compose-map "-a" [ordfeminine]) | |
| 284 | |
| 285 (define-key compose-map ".^" [periodcentered]) | |
| 286 | |
| 287 (define-key compose-map "//" "\\") | |
| 288 (define-key compose-map "/<" "\\") | |
| 289 (define-key compose-map "/^" "|") | |
| 290 (define-key compose-map "/C" [cent]) | |
| 291 (define-key compose-map "/c" [cent]) | |
| 292 (define-key compose-map "/U" [mu]) | |
| 293 (define-key compose-map "/u" [mu]) | |
| 294 (define-key compose-map "/O" [Ooblique]) | |
| 295 (define-key compose-map "/o" [oslash]) | |
| 296 | |
| 297 (define-key compose-map "0X" [currency]) | |
| 298 (define-key compose-map "0x" [currency]) | |
| 299 (define-key compose-map "0S" [section]) | |
| 300 (define-key compose-map "0s" [section]) | |
| 301 (define-key compose-map "0C" [copyright]) | |
| 302 (define-key compose-map "0c" [copyright]) | |
| 303 (define-key compose-map "0R" [registered]) | |
| 304 (define-key compose-map "0r" [registered]) | |
| 305 (define-key compose-map "0^" [degree]) | |
| 306 | |
| 307 (define-key compose-map "1^" [onesuperior]) | |
| 308 (define-key compose-map "14" [onequarter]) | |
| 309 (define-key compose-map "12" [onehalf]) | |
| 310 | |
| 311 (define-key compose-map "2^" [twosuperior]) | |
| 312 | |
| 313 (define-key compose-map "3^" [threesuperior]) | |
| 314 (define-key compose-map "34" [threequarters]) | |
| 315 | |
| 316 (define-key compose-map ":-" [division]) | |
| 317 | |
| 318 (define-key compose-map "</" "\\") | |
| 319 (define-key compose-map "<<" [guillemotleft]) | |
| 320 | |
| 321 (define-key compose-map "=L" [sterling]) | |
| 322 (define-key compose-map "=l" [sterling]) | |
| 323 (define-key compose-map "=Y" [yen]) | |
| 324 (define-key compose-map "=y" [yen]) | |
| 325 | |
| 326 (define-key compose-map ">>" [guillemotright]) | |
| 327 | |
| 328 (define-key compose-map "??" [questiondown]) | |
| 329 | |
| 330 (define-key compose-map "AA" "@") | |
| 331 (define-key compose-map "Aa" "@") | |
| 332 (define-key compose-map "A_" [ordfeminine]) | |
| 333 (define-key compose-map "A`" [Agrave]) | |
| 334 (define-key compose-map "A'" [Aacute]) | |
| 335 (define-key compose-map "A^" [Acircumflex]) | |
| 336 (define-key compose-map "A~" [Atilde]) | |
| 337 (define-key compose-map "A\"" [Adiaeresis]) | |
| 338 (define-key compose-map "A*" [Aring]) | |
| 339 (define-key compose-map "AE" [AE]) | |
| 340 | |
| 341 (define-key compose-map "C/" [cent]) | |
| 342 (define-key compose-map "C|" [cent]) | |
| 343 (define-key compose-map "C0" [copyright]) | |
| 344 (define-key compose-map "CO" [copyright]) | |
| 345 (define-key compose-map "Co" [copyright]) | |
| 346 (define-key compose-map "C," [Ccedilla]) | |
| 347 | |
| 348 (define-key compose-map "D-" [ETH]) | |
| 349 | |
| 350 (define-key compose-map "E`" [Egrave]) | |
| 351 (define-key compose-map "E'" [Eacute]) | |
| 352 (define-key compose-map "E^" [Ecircumflex]) | |
| 353 (define-key compose-map "E\"" [Ediaeresis]) | |
| 354 | |
| 355 (define-key compose-map "I`" [Igrave]) | |
| 356 (define-key compose-map "I'" [Iacute]) | |
| 357 (define-key compose-map "I^" [Icircumflex]) | |
| 358 (define-key compose-map "I\"" [Idiaeresis]) | |
| 359 | |
| 360 (define-key compose-map "L-" [sterling]) | |
| 361 (define-key compose-map "L=" [sterling]) | |
| 362 | |
| 363 (define-key compose-map "N~" [Ntilde]) | |
| 364 | |
| 365 (define-key compose-map "OX" [currency]) | |
| 366 (define-key compose-map "Ox" [currency]) | |
| 367 (define-key compose-map "OS" [section]) | |
| 368 (define-key compose-map "Os" [section]) | |
| 369 (define-key compose-map "OC" [copyright]) | |
| 370 (define-key compose-map "Oc" [copyright]) | |
| 371 (define-key compose-map "OR" [registered]) | |
| 372 (define-key compose-map "Or" [registered]) | |
| 373 (define-key compose-map "O_" [masculine]) | |
| 374 (define-key compose-map "O`" [Ograve]) | |
| 375 (define-key compose-map "O'" [Oacute]) | |
| 376 (define-key compose-map "O^" [Ocircumflex]) | |
| 377 (define-key compose-map "O~" [Otilde]) | |
| 378 (define-key compose-map "O\"" [Odiaeresis]) | |
| 379 (define-key compose-map "O/" [Ooblique]) | |
| 380 | |
| 381 (define-key compose-map "P!" [paragraph]) | |
| 382 | |
| 383 (define-key compose-map "R0" [registered]) | |
| 384 (define-key compose-map "RO" [registered]) | |
| 385 (define-key compose-map "Ro" [registered]) | |
| 386 | |
| 387 (define-key compose-map "S!" [section]) | |
| 388 (define-key compose-map "S0" [section]) | |
| 389 (define-key compose-map "SO" [section]) | |
| 390 (define-key compose-map "So" [section]) | |
| 391 (define-key compose-map "SS" [ssharp]) | |
| 392 | |
| 393 (define-key compose-map "TH" [THORN]) | |
| 394 | |
| 395 (define-key compose-map "U`" [Ugrave]) | |
| 396 (define-key compose-map "U'" [Uacute]) | |
| 397 (define-key compose-map "U^" [Ucircumflex]) | |
| 398 (define-key compose-map "U\"" [Udiaeresis]) | |
| 399 | |
| 400 (define-key compose-map "X0" [currency]) | |
| 401 (define-key compose-map "XO" [currency]) | |
| 402 (define-key compose-map "Xo" [currency]) | |
| 403 | |
| 404 (define-key compose-map "Y-" [yen]) | |
| 405 (define-key compose-map "Y=" [yen]) | |
| 406 (define-key compose-map "Y'" [Yacute]) | |
| 407 | |
| 408 (define-key compose-map "_A" [ordfeminine]) | |
| 409 (define-key compose-map "_a" [ordfeminine]) | |
| 410 (define-key compose-map "_^" [macron]) | |
| 411 (define-key compose-map "_O" [masculine]) | |
| 412 (define-key compose-map "_o" [masculine]) | |
| 413 | |
| 414 (define-key compose-map "aA" "@") | |
| 415 (define-key compose-map "aa" "@") | |
| 416 (define-key compose-map "a_" [ordfeminine]) | |
| 417 (define-key compose-map "a-" [ordfeminine]) | |
| 418 (define-key compose-map "a`" [agrave]) | |
| 419 (define-key compose-map "a'" [aacute]) | |
| 420 (define-key compose-map "a^" [acircumflex]) | |
| 421 (define-key compose-map "a~" [atilde]) | |
| 422 (define-key compose-map "a\"" [adiaeresis]) | |
| 423 (define-key compose-map "a*" [aring]) | |
| 424 (define-key compose-map "ae" [ae]) | |
| 425 | |
| 426 (define-key compose-map "c/" [cent]) | |
| 427 (define-key compose-map "c|" [cent]) | |
| 428 (define-key compose-map "c0" [copyright]) | |
| 429 (define-key compose-map "cO" [copyright]) | |
| 430 (define-key compose-map "co" [copyright]) | |
| 431 (define-key compose-map "c," [ccedilla]) | |
| 432 | |
| 433 (define-key compose-map "d-" [eth]) | |
| 434 | |
| 435 (define-key compose-map "e`" [egrave]) | |
| 436 (define-key compose-map "e'" [eacute]) | |
| 437 (define-key compose-map "e^" [ecircumflex]) | |
| 438 (define-key compose-map "e\"" [ediaeresis]) | |
| 439 | |
| 440 (define-key compose-map "i`" [igrave]) | |
| 441 (define-key compose-map "i'" [iacute]) | |
| 442 (define-key compose-map "i^" [icircumflex]) | |
| 443 (define-key compose-map "i\"" [idiaeresis]) | |
| 444 (define-key compose-map "i:" [idiaeresis]) | |
| 445 | |
| 446 (define-key compose-map "l-" [sterling]) | |
| 447 (define-key compose-map "l=" [sterling]) | |
| 448 | |
| 449 (define-key compose-map "n~" [ntilde]) | |
| 450 | |
| 451 (define-key compose-map "oX" [currency]) | |
| 452 (define-key compose-map "ox" [currency]) | |
| 453 (define-key compose-map "oC" [copyright]) | |
| 454 (define-key compose-map "oc" [copyright]) | |
| 455 (define-key compose-map "oR" [registered]) | |
| 456 (define-key compose-map "or" [registered]) | |
| 457 (define-key compose-map "oS" [section]) | |
| 458 (define-key compose-map "os" [section]) | |
| 459 (define-key compose-map "o_" [masculine]) | |
| 460 (define-key compose-map "o`" [ograve]) | |
| 461 (define-key compose-map "o'" [oacute]) | |
| 462 (define-key compose-map "o^" [ocircumflex]) | |
| 463 (define-key compose-map "o~" [otilde]) | |
| 464 (define-key compose-map "o\"" [odiaeresis]) | |
| 465 (define-key compose-map "o/" [oslash]) | |
| 466 | |
| 467 (define-key compose-map "p!" [paragraph]) | |
| 468 | |
| 469 (define-key compose-map "r0" [registered]) | |
| 470 (define-key compose-map "rO" [registered]) | |
| 471 (define-key compose-map "ro" [registered]) | |
| 472 | |
| 473 (define-key compose-map "s!" [section]) | |
| 474 (define-key compose-map "s0" [section]) | |
| 475 (define-key compose-map "sO" [section]) | |
| 476 (define-key compose-map "so" [section]) | |
| 477 (define-key compose-map "ss" [ssharp]) | |
| 478 | |
| 479 (define-key compose-map "th" [thorn]) | |
| 480 | |
| 481 (define-key compose-map "u`" [ugrave]) | |
| 482 (define-key compose-map "u'" [uacute]) | |
| 483 (define-key compose-map "u^" [ucircumflex]) | |
| 484 (define-key compose-map "u\"" [udiaeresis]) | |
| 485 (define-key compose-map "u/" [mu]) | |
| 486 | |
| 487 (define-key compose-map "x0" [currency]) | |
| 488 (define-key compose-map "xO" [currency]) | |
| 489 (define-key compose-map "xo" [currency]) | |
| 490 (define-key compose-map "xx" [multiply]) | |
| 491 | |
| 492 (define-key compose-map "y-" [yen]) | |
| 493 (define-key compose-map "y=" [yen]) | |
| 494 (define-key compose-map "y'" [yacute]) | |
| 495 (define-key compose-map "y\"" [ydiaeresis]) | |
| 496 | |
| 497 (define-key compose-map "|C" [cent]) | |
| 498 (define-key compose-map "|c" [cent]) | |
| 499 (define-key compose-map "||" [brokenbar]) | |
| 500 | |
| 501 | |
| 502 ;; Suppose we type these three physical keys: [Multi_key " a] | |
| 503 ;; Xlib can deliver these keys as the following sequences of keysyms: | |
| 504 ;; | |
| 505 ;; - [Multi_key " a] (no surprise here) | |
| 506 ;; - [adiaeresis] (OK, Xlib is doing compose processing for us) | |
| 507 ;; - [Multi_key " adiaeresis] (Huh?) | |
| 508 ;; | |
| 509 ;; It is the last possibility that is arguably a bug. Xlib can't | |
| 510 ;; decide whether it's really doing compose processing or not (or | |
| 511 ;; actually, different parts of Xlib disagree). | |
| 512 ;; | |
| 513 ;; So we'll just convert [Multi_key " adiaeresis] to [adiaeresis] | |
| 514 (defun xlib-input-method-bug-workaround (keymap) | |
| 515 (map-keymap | |
| 516 (lambda (key value) | |
| 517 (cond | |
| 518 ((keymapp value) | |
| 519 (xlib-input-method-bug-workaround value)) | |
| 520 ((and (sequencep value) | |
| 521 (eq 1 (length value)) | |
| 522 (null (lookup-key keymap value))) | |
| 523 (define-key keymap value value)))) | |
| 524 keymap)) | |
| 525 (xlib-input-method-bug-workaround compose-map) | |
| 526 (unintern 'xlib-input-method-bug-workaround) | |
| 527 | |
| 528 ;; While we're at it, a similar mechanism will make colon equivalent | |
| 529 ;; to doublequote for diaeresis processing. Some Xlibs do this. | |
| 530 (defun alias-colon-to-doublequote (keymap) | |
| 531 (map-keymap | |
| 532 (lambda (key value) | |
| 533 (when (keymapp value) | |
| 534 (alias-colon-to-doublequote value)) | |
| 535 (when (eq key '\") | |
| 536 (define-key keymap ":" value))) | |
| 537 keymap)) | |
| 538 (alias-colon-to-doublequote compose-map) | |
| 539 (unintern 'alias-colon-to-doublequote) | |
| 540 | |
| 541 ;;; Electric dead keys: making a' mean a-acute. | |
| 542 | |
| 543 | |
| 544 (defun electric-diacritic (&optional count) | |
| 545 "Modify the previous character with an accent. | |
| 546 For example, if `:' is bound to this command, then typing `a:' | |
| 547 will first insert `a' and then turn it into `\344' (adiaeresis). | |
| 548 The keys to which this command may be bound (and the accents | |
| 549 which it understands) are: | |
| 550 | |
| 551 ' (acute) \301\311\315\323\332\335 \341\351\355\363\372\375 | |
| 552 ` (grave) \300\310\314\322\331 \340\350\354\362\371 | |
| 553 : (diaeresis) \304\313\317\326\334 \344\353\357\366\374\377 | |
| 554 ^ (circumflex) \302\312\316\324\333 \342\352\356\364\373 | |
| 555 , (cedilla) \307\347 | |
| 556 . (ring) \305\345" | |
| 557 (interactive "p") | |
| 558 (or count (setq count 1)) | |
| 559 | |
| 560 (if (not (eq last-command 'self-insert-command)) | |
| 561 ;; Only do the magic if the two chars were typed in succession. | |
| 562 (self-insert-command count) | |
| 563 | |
| 564 ;; This is so that ``a : C-x u'' will transform `adiaeresis' back into `a:' | |
| 565 (self-insert-command count) | |
| 566 (undo-boundary) | |
| 567 (delete-char (- count)) | |
| 568 | |
| 569 (let* ((c last-command-char) | |
| 570 (map (cond ((eq c ?') compose-acute-map) | |
| 571 ((eq c ?`) compose-grave-map) | |
| 572 ((eq c ?,) compose-cedilla-map) | |
| 573 ((eq c ?:) compose-diaeresis-map) | |
| 574 ((eq c ?^) compose-circumflex-map) | |
| 575 ((eq c ?~) compose-tilde-map) | |
| 576 ((eq c ?.) compose-ring-map) | |
| 577 (t (error "unknown diacritic: %s (%c)" c c)))) | |
| 578 (base-char (preceding-char)) | |
| 579 (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics? | |
| 580 (<= (downcase base-char) ?z) | |
| 581 (lookup-key map (make-string 1 base-char))))) | |
| 582 (if (and (vectorp mod-char) (= (length mod-char) 1)) | |
| 583 (setq mod-char (aref mod-char 0))) | |
| 584 (if (and mod-char (symbolp mod-char)) | |
| 585 (setq mod-char (or (get mod-char character-set-property) mod-char))) | |
| 586 (if (and mod-char (> count 0)) | |
| 587 (delete-char -1) | |
| 588 (setq mod-char c)) | |
| 589 (while (> count 0) | |
| 590 (insert mod-char) | |
| 591 (setq count (1- count)))))) | |
| 592 | |
| 593 ;; should "::" mean "¨" and ": " mean ":"? | |
| 594 ;; should we also do | |
| 595 ;; (?~ | |
| 596 ;; (?A "\303") | |
| 597 ;; (?C "\307") | |
| 598 ;; (?D "\320") | |
| 599 ;; (?N "\321") | |
| 600 ;; (?O "\325") | |
| 601 ;; (?a "\343") | |
| 602 ;; (?c "\347") | |
| 603 ;; (?d "\360") | |
| 604 ;; (?n "\361") | |
| 605 ;; (?o "\365") | |
| 606 ;; (?> "\273") | |
| 607 ;; (?< "\253") | |
| 608 ;; (? "~")) ; no special code | |
| 609 ;; (?\/ | |
| 610 ;; (?A "\305") ;; A-with-ring (Norwegian and Danish) | |
| 611 ;; (?E "\306") ;; AE-ligature (Norwegian and Danish) | |
| 612 ;; (?O "\330") | |
| 613 ;; (?a "\345") ;; a-with-ring (Norwegian and Danish) | |
| 614 ;; (?e "\346") ;; ae-ligature (Norwegian and Danish) | |
| 615 ;; (?o "\370") | |
| 616 ;; (? "/")) ; no special code | |
| 617 | |
| 618 | |
| 619 ;;; Providing help in the middle of a compose sequence. (Way cool.) | |
| 620 | |
| 621 (eval-when-compile | |
| 622 (defsubst next-composable-event () | |
| 623 (let (event) | |
| 624 (while (progn | |
| 625 (setq event (next-command-event)) | |
| 626 (not (or (key-press-event-p event) | |
| 627 (button-press-event-p event)))) | |
| 628 (dispatch-event event)) | |
| 629 event))) | |
| 630 | |
| 631 (defun compose-help (ignore-prompt) | |
| 632 (let* ((keys (apply 'vector (nbutlast (append (this-command-keys) nil)))) | |
| 633 (map (or (lookup-key function-key-map keys) | |
| 634 (error "can't find map? %s %s" keys (this-command-keys)))) | |
| 635 binding) | |
| 636 (save-excursion | |
| 637 (with-output-to-temp-buffer "*Help*" | |
| 638 (set-buffer "*Help*") | |
| 639 (erase-buffer) | |
| 640 (message "Working...") | |
| 641 (setq ctl-arrow 'compose) ; non-t-non-nil | |
| 642 (insert "You are typing a compose sequence. So far you have typed: ") | |
| 643 (insert (key-description keys)) | |
| 644 (insert "\nCompletions from here are:\n\n") | |
| 645 (map-keymap 'compose-help-mapper map t) | |
| 646 (message "? "))) | |
| 647 (while (keymapp map) | |
| 648 (setq binding (lookup-key map (vector (next-composable-event)))) | |
| 649 (if (null binding) | |
| 650 (message "No such key in keymap. Try again.") | |
| 651 (setq map binding))) | |
| 652 binding)) | |
| 653 | |
| 654 (put 'compose-help 'isearch-command t) ; so that it doesn't terminate isearch | |
| 655 | |
| 656 (defun compose-help-mapper (key binding) | |
| 657 (if (and (symbolp key) | |
| 658 (get key character-set-property)) | |
| 659 (setq key (get key character-set-property))) | |
| 660 (if (eq binding 'compose-help) ; suppress that... | |
| 661 nil | |
| 662 (if (keymapp binding) | |
| 663 (let ((p (point))) | |
| 664 (map-keymap 'compose-help-mapper binding t) | |
| 665 (goto-char p) | |
| 666 (while (not (eobp)) | |
| 667 (if (characterp key) | |
| 668 (insert (make-string 1 key)) | |
| 669 (insert (single-key-description key))) | |
| 670 (insert " ") | |
| 671 (forward-line 1))) | |
| 672 (if (characterp key) | |
| 673 (insert (make-string 1 key)) | |
| 674 (insert (single-key-description key))) | |
| 675 (indent-to 16) | |
| 676 (let ((code (and (vectorp binding) | |
| 677 (= 1 (length binding)) | |
| 678 (get (aref binding 0) character-set-property)))) | |
| 679 (if code | |
| 680 (insert (make-string 1 code)) | |
| 681 (if (stringp binding) | |
| 682 (insert binding) | |
| 683 (insert (prin1-to-string binding))))) | |
| 684 (when (and (vectorp binding) (= 1 (length binding))) | |
| 685 (indent-to 32) | |
| 686 (insert (symbol-name (aref binding 0))))) | |
| 687 (insert "\n"))) | |
| 688 | |
| 689 ;; define it at top-level in the compose map... | |
| 690 ;;(define-key compose-map [(control h)] 'compose-help) | |
| 691 ;;(define-key compose-map [help] 'compose-help) | |
| 692 ;; and then define it in each sub-map of the compose map. | |
| 693 (map-keymap | |
| 694 (lambda (key binding) | |
| 695 (when (keymapp binding) | |
| 696 ;; (define-key binding [(control h)] 'compose-help) | |
| 697 ;; (define-key binding [help] 'compose-help) | |
| 698 )) | |
| 699 compose-map nil) | |
| 700 | |
| 701 ;; Make redisplay display the accented letters | |
| 702 (if (memq (default-value 'ctl-arrow) '(t nil)) | |
| 703 (setq-default ctl-arrow 'iso-8859/1)) | |
| 704 | |
| 705 | |
| 706 (provide 'x-compose) | |
| 707 | |
| 708 ;;; x-compose.el ends here |