Mercurial > hg > xemacs-beta
annotate lisp/abbrev.el @ 1204:e22b0213b713
[xemacs-hg @ 2003-01-12 11:07:58 by michaels]
modules/ChangeLog:
2002-12-16 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
remove ifdef USE_KKCC.
src/ChangeLog:
2003-01-08 Mike Sperber <mike@xemacs.org>
* console.h (CDFW_CONSOLE): Don't lead to a crash if we're dealing
with a dead window/frame/device/console.
2002-12-20 Mike Sperber <mike@xemacs.org>
* ui-gtk.c: Fix typo from Ben's patch: emacs_ffi_data is a
typedef, not a struct. emacs_gtk_object_data is a typedef, not a
struct.
* gtk-glue.c (gdk_event_to_emacs_event): Fix typos from Ben's
patch: le -> emacs_event + rearrange the code.
* event-gtk.c (gtk_event_to_emacs_event): Fix typos from Ben's
patch: ..._UNDERLYING_GDK_EVENT -> ..._GDK_EVENT, ev -> key_event.
* device-gtk.c: Fix typo from Ben's patch: x_keysym_map_hash_table
-> x_keysym_map_hashtable.
2002-12-19 Mike Sperber <mike@xemacs.org>
* menubar-x.c (set_frame_menubar): Initialize protect_me field of
popup_data.
2002-12-16 Ben Wing <ben@xemacs.org>
Major cleanup of KKCC, etc.
KKCC, pdump-related:
-- descriptions are written for all objects. this required some
changes in the format of some objects, e.g. extents, popup-data,
coding system, lstream, lcrecord-list.
-- KKCC now handles weakness in markers, hash tables, elsewhere
correctly (formerly, you'd eventually get a stack overflow due
to endlessly expanding markers).
-- textual changes: lrecord_description -> memory_description,
struct_description -> sized_memory_description.
-- extensive comment describing descriptions and pdump.
-- redo XD_UNION so it works inline and change its format to provide
sufficient info for pdump. implement XD_UNION in pdump. also add
XD_UNION_DYNAMIC_SIZE, which works like XD_UNION except for when
auto-computing structure sizes.
-- add support for XD_INDIRECT in description offsets (used by
extents).
-- add support for "description maps", allowing for indirect
descriptions that are retrieved from an object at run-time. this
generalizes XD_CODING_SYSTEM_END, XD_SPECIFIER_END, etc., which
have now been eliminated.
-- add a fifth field "flags" to memory_description, to support flags
that can be specified for this particular line. Currently defined
flags are XD_FLAG_NO_KKCC (KKCC should ignore this entry; useful
for the weakness above in markers, etc.), XD_FLAG_NO_PDUMP (pdump
should ignore this entry), XD_FLAG_UNION_DEFAULT_ENTRY (in
union maps, this specifies a "default" entry for all remaining
values), and XD_FLAG_FREE_LISP_OBJECT (for use with lcrecord-lists).
-- clean up the kkcc-itis in events, so that the differences
between event data as separate objects and as a union are now
minimized to a small number of places. with the new XD_UNION, we
no longer need event data as separate objects, so this code is no
longer ifdef USE_KKCC, but instead ifdef EVENT_DATA_AS_OBJECTS,
not used by default. make sure that we explicitly free the
separate event data objects when no longer in use, to maintain the
invariant the event processing causes no consing.
-- also remove other USE_KKCC ifdefs when not necessary.
-- allow for KKCC compilation under MS Windows.
-- fix README.kkcc.
-- dump_add_root_object -> dump_add_root_lisp_object.
-- implement dump_add_root_block and use this to handle
dump_add_opaque.
-- factor out some code duplicated in kkcc and pdump.
Other allocation/object-related:
-- change various *slots.h so MARKED_SLOT() call no longer
includes semicolon.
-- free_marker() takes a Lisp_Object not a direct pointer.
-- make bit vectors lcrecords, like vectors, and eliminate code
that essentially duplicated the lcrecord handling.
-- additional asserts in FREE_FIXED_TYPE, formerly duplicated in
the various callers of this.
-- all lcrecord allocation functions now zero out the returned
lcrecords. unnecessary calls to zero_lcrecord removed. add long
comment describing these functions.
-- extract out process and coding system slots, like for buffers,
frames, etc.
-- lcrecords now set the type of items sitting on the free list to
lcrecord_type_free.
-- changes to the way that gap arrays are allocated, for kkcc's
benefit -- now, one single memory block with a stretchy array on
the end, instead of a separate block holding the array.
Error-checking-related:
-- now can compile with C++ under MS Windows. clean up compile errors
discovered that way. (a few were real problems)
-- add C++ error-checking code to verify problems with mismatched
GCPRO/UNGCPRO. (there were a few in the kkcc code.) add long
comment about how to catch insufficient GCPRO (yes, it's possible
using C++).
-- add debug_p4(), a simple object printer, when debug_print()
doesn't work.
-- add dp() and db() as short synonyms of debug_print(),
debug_backtrace().
-- `print' tries EXTREMELY hard to avoid core dumping when printing
when crashing or from debug_print(), and tries as hard as it
reasonably can in other situations.
-- Correct the message output upon crashing to be more up-to-date.
Event-related:
-- document event-matches-key-specifier-p better.
-- generalize the dispatch queues formerly duplicated in the
various event implementations. add event methods to drain pending
events. generalize and clean up QUIT handling, removing
event-specific quit processing. allow arbitrary keystrokes, not
just ASCII, to be the QUIT char. among other things, this should
fix some longstanding bugs in X quit handling. long comment
describing the various event queues.
-- implement delaying of XFlush() if there are pending expose events.
SOMEONE PLEASE TRY THIS OUT.
-- Fix `xemacs -batch -l dunnet' under Cygwin. Try to fix under
MS Windows but not quite there yet.
Other:
-- class -> class_ and no more C++ games with this item.
new -> new_ in the lwlib code, so far not elsewhere.
-- use `struct htentry' not `struct hentry' in elhash.c to avoid
debugger confusion with hash.c.
-- new macros ALIST_LOOP_3, ALIST_LOOP_4.
* README.kkcc:
* alloc.c:
* alloc.c (deadbeef_memory):
* alloc.c (allocate_lisp_storage):
* alloc.c (copy_lisp_object):
* alloc.c (ALLOCATE_FIXED_TYPE_1):
* alloc.c (FREE_FIXED_TYPE):
* alloc.c (make_vector_internal):
* alloc.c (make_bit_vector_internal):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (struct string_chars_block):
* alloc.c (mark_lcrecord_list):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (alloc_automanaged_lcrecord):
* alloc.c (staticpro_1):
* alloc.c (staticpro):
* alloc.c (lispdesc_indirect_count_1):
* alloc.c (lispdesc_indirect_description_1):
* alloc.c (lispdesc_one_description_line_size):
* alloc.c (lispdesc_structure_size):
* alloc.c (mark_object_maybe_checking_free):
* alloc.c (mark_with_description):
* alloc.c (mark_struct_contents):
* alloc.c (mark_object):
* alloc.c (tick_lcrecord_stats):
* alloc.c (free_cons):
* alloc.c (free_key_data):
* alloc.c (free_button_data):
* alloc.c (free_motion_data):
* alloc.c (free_process_data):
* alloc.c (free_timeout_data):
* alloc.c (free_magic_data):
* alloc.c (free_magic_eval_data):
* alloc.c (free_eval_data):
* alloc.c (free_misc_user_data):
* alloc.c (free_marker):
* alloc.c (compact_string_chars):
* alloc.c (gc_sweep):
* alloc.c (garbage_collect_1):
* alloc.c (Fgarbage_collect):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c:
* buffer.c (mark_buffer):
* buffer.c (MARKED_SLOT):
* buffer.c (cleanup_buffer_undo_lists):
* buffer.c (Fget_file_buffer):
* buffer.h (MARKED_SLOT):
* bufslots.h:
* bytecode.c:
* callint.c:
* casetab.c:
* chartab.c:
* chartab.c (symbol_to_char_table_type):
* cmdloop.c:
* cmdloop.c (Fcommand_loop_1):
* config.h.in (new):
* conslots.h:
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h:
* console-impl.h (struct console):
* console-impl.h (MARKED_SLOT):
* console-impl.h (CONSOLE_QUIT_EVENT):
* console-msw-impl.h (XM_BUMPQUEUE):
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.h:
* console-stream-impl.h:
* console-stream-impl.h (struct stream_console):
* console-stream.c:
* console-stream.c (stream_init_console):
* console-stream.h:
* console-tty.c:
* console-tty.h:
* console-x.h:
* console.c:
* console.c (mark_console):
* console.c (MARKED_SLOT):
* console.c (allocate_console):
* console.c (get_console_variant):
* console.c (create_console):
* console.c (delete_console_internal):
* console.c (Fset_input_mode):
* console.c (Fcurrent_input_mode):
* console.c (common_init_complex_vars_of_console):
* console.h:
* console.h (console_variant):
* console.h (device_metrics):
* data.c:
* data.c (Faref):
* data.c (Faset):
* data.c (decode_weak_list_type):
* database.c:
* debug.c (xemacs_debug_loop):
* debug.c (FROB):
* debug.c (Fadd_debug_class_to_check):
* debug.c (Fdelete_debug_class_to_check):
* debug.c (Fset_debug_classes_to_check):
* debug.c (Fset_debug_class_types_to_check):
* debug.c (Fdebug_types_being_checked):
* debug.h (DASSERT):
* device-gtk.c:
* device-impl.h (struct device):
* device-impl.h (MARKED_SLOT):
* device-msw.c:
* device-x.c:
* device-x.c (x_init_device_class):
* device-x.c (x_comp_visual_info):
* device-x.c (x_try_best_visual_class):
* device-x.c (x_init_device):
* device-x.c (construct_name_list):
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_display_visual_class):
* device.c:
* device.c (MARKED_SLOT):
* device.c (allocate_device):
* device.c (Fmake_device):
* device.c (delete_device_internal):
* device.c (Fset_device_class):
* device.h:
* devslots.h:
* devslots.h (MARKED_SLOT):
* dialog-msw.c:
* dired-msw.c (mswindows_ls_sort_fcn):
* dired-msw.c (mswindows_get_files):
* dired-msw.c (mswindows_format_file):
* doprnt.c (parse_doprnt_spec):
* dumper.c:
* dumper.c (struct):
* dumper.c (dump_add_root_block):
* dumper.c (dump_add_root_struct_ptr):
* dumper.c (dump_add_root_lisp_object):
* dumper.c (pdump_struct_list_elt):
* dumper.c (pdump_get_entry_list):
* dumper.c (pdump_backtrace):
* dumper.c (pdump_bump_depth):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_register_object):
* dumper.c (pdump_register_struct_contents):
* dumper.c (pdump_register_struct):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_dump_data):
* dumper.c (pdump_reloc_one):
* dumper.c (pdump_allocate_offset):
* dumper.c (pdump_scan_by_alignment):
* dumper.c (pdump_dump_root_blocks):
* dumper.c (pdump_dump_rtables):
* dumper.c (pdump_dump_root_lisp_objects):
* dumper.c (pdump):
* dumper.c (pdump_load_finish):
* dumper.c (pdump_file_get):
* dumper.c (pdump_resource_get):
* dumper.c (pdump_load):
* editfns.c (save_excursion_restore):
* editfns.c (user_login_name):
* editfns.c (save_restriction_restore):
* elhash.c:
* elhash.c (htentry):
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (HTENTRY_CLEAR_P):
* elhash.c (LINEAR_PROBING_LOOP):
* elhash.c (check_hash_table_invariants):
* elhash.c (mark_hash_table):
* elhash.c (hash_table_equal):
* elhash.c (print_hash_table_data):
* elhash.c (free_hentries):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (decode_hash_table_weakness):
* elhash.c (decode_hash_table_test):
* elhash.c (Fcopy_hash_table):
* elhash.c (resize_hash_table):
* elhash.c (pdump_reorganize_hash_table):
* elhash.c (find_htentry):
* elhash.c (Fgethash):
* elhash.c (Fputhash):
* elhash.c (remhash_1):
* elhash.c (Fremhash):
* elhash.c (Fclrhash):
* elhash.c (copy_compress_hentries):
* elhash.c (elisp_maphash_unsafe):
* elhash.c (finish_marking_weak_hash_tables):
* elhash.c (prune_weak_hash_tables):
* elhash.h:
* emacs.c:
* emacs.c (main_1):
* emacs.c (main):
* emacs.c (shut_down_emacs):
* emodules.h (dump_add_root_lisp_object):
* eval.c:
* eval.c (unwind_to_catch):
* eval.c (maybe_signal_error_1):
* eval.c (maybe_signal_continuable_error_1):
* eval.c (maybe_signal_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (maybe_signal_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (maybe_signal_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (maybe_syntax_error):
* eval.c (maybe_sferror):
* eval.c (maybe_invalid_argument):
* eval.c (maybe_invalid_constant):
* eval.c (maybe_invalid_operation):
* eval.c (maybe_invalid_change):
* eval.c (maybe_invalid_state):
* eval.c (Feval):
* eval.c (call_trapping_problems):
* eval.c (call_with_suspended_errors):
* eval.c (warn_when_safe_lispobj):
* eval.c (warn_when_safe):
* eval.c (vars_of_eval):
* event-Xt.c:
* event-Xt.c (maybe_define_x_key_as_self_inserting_character):
* event-Xt.c (x_to_emacs_keysym):
* event-Xt.c (x_event_to_emacs_event):
* event-Xt.c (emacs_Xt_enqueue_focus_event):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (emacs_Xt_compare_magic_event):
* event-Xt.c (emacs_Xt_hash_magic_event):
* event-Xt.c (emacs_Xt_handle_magic_event):
* event-Xt.c (Xt_timeout_to_emacs_event):
* event-Xt.c (Xt_process_to_emacs_event):
* event-Xt.c (signal_special_Xt_user_event):
* event-Xt.c (emacs_Xt_next_event):
* event-Xt.c (emacs_Xt_event_handler):
* event-Xt.c (emacs_Xt_drain_queue):
* event-Xt.c (emacs_Xt_event_pending_p):
* event-Xt.c (check_if_pending_expose_event):
* event-Xt.c (reinit_vars_of_event_Xt):
* event-Xt.c (vars_of_event_Xt):
* event-gtk.c:
* event-gtk.c (IS_MODIFIER_KEY):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (emacs_gtk_compare_magic_event):
* event-gtk.c (emacs_gtk_hash_magic_event):
* event-gtk.c (emacs_gtk_handle_magic_event):
* event-gtk.c (gtk_to_emacs_keysym):
* event-gtk.c (gtk_timeout_to_emacs_event):
* event-gtk.c (gtk_process_to_emacs_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (signal_special_gtk_user_event):
* event-gtk.c (emacs_gtk_next_event):
* event-gtk.c (gtk_event_to_emacs_event):
* event-gtk.c (generic_event_handler):
* event-gtk.c (emacs_shell_event_handler):
* event-gtk.c (emacs_gtk_drain_queue):
* event-gtk.c (emacs_gtk_event_pending_p):
* event-gtk.c (reinit_vars_of_event_gtk):
* event-gtk.c (vars_of_event_gtk):
* event-msw.c:
* event-msw.c (struct winsock_stream):
* event-msw.c (winsock_reader):
* event-msw.c (winsock_writer):
* event-msw.c (mswindows_enqueue_dispatch_event):
* event-msw.c (mswindows_enqueue_misc_user_event):
* event-msw.c (mswindows_enqueue_magic_event):
* event-msw.c (mswindows_enqueue_process_event):
* event-msw.c (mswindows_enqueue_mouse_button_event):
* event-msw.c (mswindows_enqueue_keypress_event):
* event-msw.c (mswindows_dequeue_dispatch_event):
* event-msw.c (emacs_mswindows_drain_queue):
* event-msw.c (mswindows_need_event_in_modal_loop):
* event-msw.c (mswindows_need_event):
* event-msw.c (mswindows_wm_timer_callback):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (remove_timeout_mapper):
* event-msw.c (emacs_mswindows_remove_timeout):
* event-msw.c (emacs_mswindows_event_pending_p):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-msw.c (emacs_mswindows_compare_magic_event):
* event-msw.c (emacs_mswindows_hash_magic_event):
* event-msw.c (emacs_mswindows_handle_magic_event):
* event-msw.c (emacs_mswindows_select_console):
* event-msw.c (emacs_mswindows_unselect_console):
* event-msw.c (reinit_vars_of_event_mswindows):
* event-msw.c (vars_of_event_mswindows):
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (reset_command_builder_event_chain):
* event-stream.c (allocate_command_builder):
* event-stream.c (copy_command_builder):
* event-stream.c (command_builder_append_event):
* event-stream.c (event_stream_event_pending_p):
* event-stream.c (event_stream_force_event_pending):
* event-stream.c (maybe_read_quit_event):
* event-stream.c (event_stream_drain_queue):
* event-stream.c (remove_quit_p_event):
* event-stream.c (event_stream_quit_p):
* event-stream.c (echo_key_event):
* event-stream.c (maybe_kbd_translate):
* event-stream.c (execute_help_form):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (enqueue_dispatch_event):
* event-stream.c (enqueue_magic_eval_event):
* event-stream.c (Fenqueue_eval_event):
* event-stream.c (enqueue_misc_user_event):
* event-stream.c (enqueue_misc_user_event_pos):
* event-stream.c (next_event_internal):
* event-stream.c (Fnext_event):
* event-stream.c (Faccept_process_output):
* event-stream.c (execute_internal_event):
* event-stream.c (munge_keymap_translate):
* event-stream.c (command_builder_find_leaf_no_mule_processing):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* event-stream.c (is_scrollbar_event):
* event-stream.c (execute_command_event):
* event-stream.c (Fdispatch_event):
* event-stream.c (Fread_key_sequence):
* event-stream.c (dribble_out_event):
* event-stream.c (vars_of_event_stream):
* event-tty.c (tty_timeout_to_emacs_event):
* event-tty.c (emacs_tty_next_event):
* event-tty.c (emacs_tty_drain_queue):
* event-tty.c (reinit_vars_of_event_tty):
* event-unixoid.c:
* event-unixoid.c (find_tty_or_stream_console_from_fd):
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (drain_tty_devices):
* event-unixoid.c (poll_fds_for_input):
* events.c:
* events.c (deinitialize_event):
* events.c (zero_event):
* events.c (mark_event):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* events.c (event_hash):
* events.c (Fmake_event):
* events.c (Fdeallocate_event):
* events.c (Fcopy_event):
* events.c (map_event_chain_remove):
* events.c (character_to_event):
* events.c (event_to_character):
* events.c (Fevent_to_character):
* events.c (format_event_object):
* events.c (upshift_event):
* events.c (downshift_event):
* events.c (event_upshifted_p):
* events.c (Fevent_live_p):
* events.c (Fevent_type):
* events.c (Fevent_timestamp):
* events.c (CHECK_EVENT_TYPE):
* events.c (CHECK_EVENT_TYPE2):
* events.c (CHECK_EVENT_TYPE3):
* events.c (Fevent_key):
* events.c (Fevent_button):
* events.c (Fevent_modifier_bits):
* events.c (event_x_y_pixel_internal):
* events.c (event_pixel_translation):
* events.c (Fevent_process):
* events.c (Fevent_function):
* events.c (Fevent_object):
* events.c (Fevent_properties):
* events.c (syms_of_events):
* events.c (vars_of_events):
* events.h:
* events.h (struct event_stream):
* events.h (struct Lisp_Key_Data):
* events.h (KEY_DATA_KEYSYM):
* events.h (EVENT_KEY_KEYSYM):
* events.h (struct Lisp_Button_Data):
* events.h (EVENT_BUTTON_BUTTON):
* events.h (struct Lisp_Motion_Data):
* events.h (EVENT_MOTION_X):
* events.h (struct Lisp_Process_Data):
* events.h (EVENT_PROCESS_PROCESS):
* events.h (struct Lisp_Timeout_Data):
* events.h (EVENT_TIMEOUT_INTERVAL_ID):
* events.h (struct Lisp_Eval_Data):
* events.h (EVENT_EVAL_FUNCTION):
* events.h (struct Lisp_Misc_User_Data):
* events.h (EVENT_MISC_USER_FUNCTION):
* events.h (struct Lisp_Magic_Eval_Data):
* events.h (EVENT_MAGIC_EVAL_INTERNAL_FUNCTION):
* events.h (struct Lisp_Magic_Data):
* events.h (EVENT_MAGIC_UNDERLYING):
* events.h (EVENT_MAGIC_GDK_EVENT):
* events.h (struct Lisp_Event):
* events.h (XEVENT_CHANNEL):
* events.h (SET_EVENT_TIMESTAMP_ZERO):
* events.h (SET_EVENT_CHANNEL):
* events.h (SET_EVENT_NEXT):
* events.h (XSET_EVENT_TYPE):
* events.h (struct command_builder):
* extents.c:
* extents.c (gap_array_adjust_markers):
* extents.c (gap_array_recompute_derived_values):
* extents.c (gap_array_move_gap):
* extents.c (gap_array_make_gap):
* extents.c (gap_array_insert_els):
* extents.c (gap_array_delete_els):
* extents.c (gap_array_make_marker):
* extents.c (gap_array_delete_marker):
* extents.c (gap_array_move_marker):
* extents.c (make_gap_array):
* extents.c (free_gap_array):
* extents.c (extent_list_num_els):
* extents.c (extent_list_insert):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (decode_extent_at_flag):
* extents.c (verify_extent_mapper):
* extents.c (symbol_to_glyph_layout):
* extents.c (syms_of_extents):
* faces.c:
* file-coding.c:
* file-coding.c (struct_detector_category_description =):
* file-coding.c (detector_category_dynarr_description_1):
* file-coding.c (struct_detector_description =):
* file-coding.c (detector_dynarr_description_1):
* file-coding.c (MARKED_SLOT):
* file-coding.c (mark_coding_system):
* file-coding.c (coding_system_extra_description_map):
* file-coding.c (coding_system_description):
* file-coding.c (allocate_coding_system):
* file-coding.c (symbol_to_eol_type):
* file-coding.c (Fcoding_system_aliasee):
* file-coding.c (set_coding_stream_coding_system):
* file-coding.c (struct convert_eol_coding_system):
* file-coding.c (struct undecided_coding_system):
* file-coding.c (undecided_mark_coding_stream):
* file-coding.c (coding_category_symbol_to_id):
* file-coding.c (struct gzip_coding_system):
* file-coding.c (coding_system_type_create):
* file-coding.h:
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (CODING_SYSTEM_SLOT_DECLARATION):
* file-coding.h (coding_system_variant):
* file-coding.h (struct coding_system_methods):
* file-coding.h (DEFINE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA):
* file-coding.h (struct coding_stream):
* fileio.c (Fsubstitute_in_file_name):
* floatfns.c:
* fns.c:
* fns.c (base64_encode_1):
* frame-gtk.c:
* frame-gtk.c (Fgtk_start_drag_internal):
* frame-impl.h (struct frame):
* frame-impl.h (MARKED_SLOT):
* frame-msw.c:
* frame-x.c:
* frame-x.c (Fcde_start_drag_internal):
* frame-x.c (Foffix_start_drag_internal):
* frame.c:
* frame.c (MARKED_SLOT):
* frame.c (allocate_frame_core):
* frame.c (delete_frame_internal):
* frame.c (Fmouse_position_as_motion_event):
* frameslots.h:
* frameslots.h (MARKED_SLOT_ARRAY):
* free-hook.c:
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-x.c:
* glyphs-x.c (convert_EImage_to_XImage):
* glyphs.c:
* glyphs.c (process_image_string_instantiator):
* glyphs.c (mark_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (unmap_subwindow):
* glyphs.c (map_subwindow):
* glyphs.c (syms_of_glyphs):
* glyphs.c (specifier_type_create_image):
* glyphs.h:
* glyphs.h (struct text_image_instance):
* glyphs.h (struct Lisp_Image_Instance):
* gmalloc.c:
* gmalloc.c ("C"):
* gpmevent.c (Freceive_gpm_event):
* gpmevent.c (gpm_next_event_cb):
* gpmevent.c (vars_of_gpmevent):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.c (gtk_xemacs_class_init):
* gui-msw.c:
* gui-msw.c (mswindows_handle_gui_wm_command):
* gui-msw.c (mswindows_translate_menu_or_dialog_item):
* gui-x.c:
* gui-x.c (mark_popup_data):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (gcpro_popup_callbacks):
* gui-x.c (ungcpro_popup_callbacks):
* gui-x.c (free_popup_widget_value_tree):
* gui-x.c (popup_selection_callback):
* gui-x.h:
* gui-x.h (struct popup_data):
* gui.c:
* gui.c (allocate_gui_item):
* gutter.c (decode_gutter_position):
* hash.c (NULL_ENTRY):
* indent.c (vmotion_1):
* indent.c (vmotion_pixels):
* input-method-motif.c (res):
* input-method-xlib.c (IMInstantiateCallback):
* input-method-xlib.c (XIM_init_device):
* input-method-xlib.c (res):
* intl-encap-win32.c:
* intl-encap-win32.c (qxeSHGetDataFromIDList):
* intl-win32.c:
* intl-win32.c (mswindows_multibyte_cp_type):
* intl-win32.c (struct mswindows_multibyte_coding_system):
* keymap.c:
* keymap.c (make_key_description):
* keymap.c (keymap_store):
* keymap.c (get_keyelt):
* keymap.c (keymap_lookup_1):
* keymap.c (define_key_parser):
* keymap.c (key_desc_list_to_event):
* keymap.c (event_matches_key_specifier_p):
* keymap.c (meta_prefix_char_p):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fdefine_key):
* keymap.c (struct raw_lookup_key_mapper_closure):
* keymap.c (raw_lookup_key):
* keymap.c (raw_lookup_key_mapper):
* keymap.c (lookup_keys):
* keymap.c (lookup_events):
* keymap.c (Flookup_key):
* keymap.c (struct map_keymap_unsorted_closure):
* keymap.c (map_keymap_unsorted_mapper):
* keymap.c (map_keymap_sorted):
* keymap.c (map_keymap_mapper):
* keymap.c (map_keymap):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (Faccessible_keymaps):
* keymap.c (Fsingle_key_description):
* keymap.c (raw_keys_to_keys):
* keymap.c (format_raw_keys):
* keymap.c (where_is_recursive_mapper):
* keymap.c (where_is_internal):
* keymap.c (describe_map_mapper_shadow_search):
* keymap.c (keymap_lookup_inherited_mapper):
* keymap.c (describe_map_mapper):
* keymap.h (event_matches_key_specifier_p):
* lisp.h:
* lisp.h (this):
* lisp.h (RETURN_NOT_REACHED):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (UNGCPRO_1):
* lisp.h (NUNGCPRO):
* lisp.h (NNUNGCPRO):
* lisp.h (DECLARE_INLINE_HEADER):
* lrecord.h:
* lrecord.h (struct lrecord_header):
* lrecord.h (struct lcrecord_header):
* lrecord.h (lrecord_type):
* lrecord.h (struct lrecord_implementation):
* lrecord.h (RECORD_DUMPABLE):
* lrecord.h (memory_description_type):
* lrecord.h (data_description_entry_flags):
* lrecord.h (struct memory_description):
* lrecord.h (struct sized_memory_description):
* lrecord.h (XD_INDIRECT):
* lrecord.h (XD_IS_INDIRECT):
* lrecord.h (XD_DYNARR_DESC):
* lrecord.h (DEFINE_BASIC_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION):
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION):
* lrecord.h (alloc_lcrecord_type):
* lstream.c:
* lstream.c (Lstream_new):
* lstream.c (lisp_buffer_marker):
* lstream.h:
* lstream.h (lstream_implementation):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION):
* lstream.h (DEFINE_LSTREAM_IMPLEMENTATION_WITH_DATA):
* marker.c:
* marker.c (copy_marker_1):
* mem-limits.h:
* menubar-gtk.c:
* menubar-gtk.c (gtk_popup_menu):
* menubar-msw.c:
* menubar-msw.c (mswindows_popup_menu):
* menubar-x.c (make_dummy_xbutton_event):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (menu_accelerator_safe_compare):
* menubar-x.c (menu_accelerator_safe_mod_compare):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (Fcharset_property):
* mule-coding.c:
* mule-coding.c (ccs_description_1):
* mule-coding.c (ccs_description =):
* mule-coding.c (ccsd_description_1):
* mule-coding.c (ccsd_description =):
* nt.c (getpwnam):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_is_executable):
* nt.c (read_unc_volume):
* nt.c (mswindows_access):
* nt.c (mswindows_link):
* nt.c (mswindows_fstat):
* nt.c (mswindows_stat):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty.c:
* objects-x.c (allocate_nearest_color):
* objects.c:
* objects.c (Fmake_color_instance):
* objects.c (Fmake_font_instance):
* objects.c (font_instantiate):
* opaque.c:
* opaque.c (make_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early):
* print.c:
* print.c (printing_badness):
* print.c (printing_major_badness):
* print.c (print_internal):
* print.c (debug_p4):
* print.c (dp):
* print.c (debug_backtrace):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-unix.c:
* process-unix.c (struct unix_process_data):
* process-unix.c (get_internet_address):
* process-unix.c (unix_alloc_process_data):
* process-unix.c (unix_create_process):
* process-unix.c (try_to_initialize_subtty):
* process-unix.c (unix_kill_child_process):
* process-unix.c (process_type_create_unix):
* process.c:
* process.c (mark_process):
* process.c (MARKED_SLOT):
* process.c (make_process_internal):
* process.c (Fprocess_tty_name):
* process.c (decode_signal):
* process.h:
* procimpl.h:
* procimpl.h (struct process_methods):
* procimpl.h (struct Lisp_Process):
* rangetab.c:
* realpath.c (readlink_and_correct_case):
* redisplay-x.c (x_window_output_end):
* redisplay-x.c (x_redraw_exposed_area):
* redisplay-x.c (x_clear_frame):
* redisplay.c:
* redisplay.h:
* redisplay.h (struct rune_dglyph):
* redisplay.h (struct rune):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* specifier.c:
* specifier.c (specifier_empty_extra_description_1):
* specifier.c (make_specifier_internal):
* specifier.c (decode_locale_type):
* specifier.c (decode_how_to_add_specification):
* specifier.h:
* specifier.h (struct specifier_methods):
* specifier.h (DEFINE_SPECIFIER_TYPE_WITH_DATA):
* specifier.h (INITIALIZE_SPECIFIER_TYPE_WITH_DATA):
* symbols.c:
* symbols.c (Fsetplist):
* symbols.c (default_value):
* symbols.c (decode_magic_handler_type):
* symbols.c (handler_type_from_function_symbol):
* symbols.c (Fdefvaralias):
* symbols.c (init_symbols_once_early):
* symbols.c (reinit_symbols_early):
* symsinit.h:
* sysdep.c (sys_subshell):
* sysdep.c (tty_init_sys_modes_on_device):
* syswindows.h:
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* text.c (reinit_eistring_early):
* text.c (init_eistring_once_early):
* text.c (reinit_vars_of_text):
* text.h:
* text.h (INC_IBYTEPTR_FMT):
* text.h (DEC_IBYTEPTR_FMT):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* tooltalk.c:
* ui-gtk.c:
* unexnt.c:
* unexnt.c (_start):
* unexnt.c (unexec):
* unexnt.c (get_section_info):
* unicode.c:
* unicode.c (vars_of_unicode):
* window.c:
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (update_mirror_internal):
* winslots.h:
| author | michaels |
|---|---|
| date | Sun, 12 Jan 2003 11:08:22 +0000 |
| parents | a634e3b7acc8 |
| children | 69c43a181729 |
| rev | line source |
|---|---|
| 428 | 1 ;;; abbrev.el --- abbrev mode commands for Emacs |
| 2 | |
| 3 ;; Copyright (C) 1985, 1986, 1987, 1992, 1997 Free Software Foundation, Inc. | |
| 814 | 4 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: abbrev, 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.34 (With some additions) | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs. | |
| 31 | |
| 32 ;; This facility is documented in the Emacs Manual. | |
| 33 | |
| 34 ;;; Code: | |
| 35 | |
| 36 (defgroup abbrev nil | |
| 37 "Abbreviation handling, typing shortcuts, macros." | |
| 38 :tag "Abbreviations" | |
| 39 :group 'editing) | |
| 40 | |
| 814 | 41 (defcustom abbrev-mode nil |
| 428 | 42 "Word abbreviations mode." |
| 814 | 43 :initialize #'set-default |
| 44 :set #'(lambda (sym val) | |
| 45 (global-abbrev-mode (if val 1 0))) | |
| 428 | 46 :group 'abbrev) |
| 47 | |
| 814 | 48 (defcustom only-global-abbrevs nil |
| 49 "*Non-nil means user plans to use global abbrevs only. | |
| 428 | 50 Makes the commands to define mode-specific abbrevs define global ones instead." |
| 51 :type 'boolean | |
| 52 :group 'abbrev) | |
| 53 | |
| 814 | 54 (defcustom defining-abbrev-turns-on-abbrev-mode t |
| 55 "*NOn-nil turns on abbrev-mode whenever an abbrev is defined. | |
| 56 This occurs only when the user-level commands (e.g. `add-global-abbrev') | |
| 57 are used. abbrev-mode is turned on in all buffers or the current-buffer | |
| 58 only, depending on whether a global or mode-specific abbrev is defined." | |
| 59 ;;#### should turn on in all buffers of current mode in mode-specific abbrev! | |
| 60 :type 'boolean | |
| 61 :group 'abbrev) | |
| 62 | |
| 428 | 63 ;;; XEmacs: the following block of code is not in FSF |
| 64 (defvar abbrev-table-name-list '() | |
| 65 "List of symbols whose values are abbrev tables.") | |
| 66 | |
| 67 (defvar abbrevs-changed nil | |
| 68 "Set non-nil by defining or altering any word abbrevs. | |
| 69 This causes `save-some-buffers' to offer to save the abbrevs.") | |
| 70 | |
| 71 (defun make-abbrev-table () | |
| 72 "Return a new, empty abbrev table object." | |
| 73 (make-vector 59 0)) ; 59 is prime | |
| 74 | |
| 75 (defun clear-abbrev-table (table) | |
| 76 "Undefine all abbrevs in abbrev table TABLE, leaving it empty." | |
| 77 (fillarray table 0) | |
| 78 (setq abbrevs-changed t) | |
| 79 nil) | |
| 80 | |
| 444 | 81 (defun define-abbrev-table (table-name definitions) |
| 82 "Define TABLE-NAME (a symbol) as an abbrev table name. | |
| 428 | 83 Define abbrevs in it according to DEFINITIONS, which is a list of elements |
| 84 of the form (ABBREVNAME EXPANSION HOOK USECOUNT)." | |
| 444 | 85 (let ((table (and (boundp table-name) (symbol-value table-name)))) |
| 428 | 86 (cond ((vectorp table)) |
| 87 ((not table) | |
| 88 (setq table (make-abbrev-table)) | |
| 444 | 89 (set table-name table) |
| 90 (setq abbrev-table-name-list (cons table-name abbrev-table-name-list))) | |
| 428 | 91 (t |
| 444 | 92 (setq table (wrong-type-argument 'vectorp table)) |
| 93 (set table-name table))) | |
| 94 (while definitions | |
| 95 (apply (function define-abbrev) table (car definitions)) | |
| 96 (setq definitions (cdr definitions))))) | |
| 428 | 97 |
| 98 (defun define-abbrev (table name &optional expansion hook count) | |
| 99 "Define an abbrev in TABLE named NAME, to expand to EXPANSION or call HOOK. | |
| 100 NAME and EXPANSION are strings. Hook is a function or `nil'. | |
| 101 To undefine an abbrev, define it with an expansion of `nil'." | |
| 446 | 102 (check-type expansion (or null string)) |
| 103 (check-type count (or null integer)) | |
| 104 (check-type table vector) | |
| 428 | 105 (let* ((sym (intern name table)) |
| 106 (oexp (and (boundp sym) (symbol-value sym))) | |
| 107 (ohook (and (fboundp sym) (symbol-function sym)))) | |
| 108 (unless (and (equal ohook hook) | |
| 109 (stringp oexp) | |
| 110 (stringp expansion) | |
| 111 (string-equal oexp expansion)) | |
| 112 (setq abbrevs-changed t) | |
| 113 ;; If there is a non-word character in the string, set the flag. | |
| 114 (if (string-match "\\W" name) | |
| 115 (set (intern " " table) nil))) | |
| 116 (set sym expansion) | |
| 117 (fset sym hook) | |
| 118 (setplist sym (or count 0)) | |
| 119 name)) | |
| 120 | |
| 121 | |
| 122 ;; Fixup stuff from bootstrap def of define-abbrev-table in subr.el | |
| 123 (let ((l abbrev-table-name-list)) | |
| 124 (while l | |
| 125 (let ((fixup (car l))) | |
| 126 (if (consp fixup) | |
| 127 (progn | |
| 128 (setq abbrev-table-name-list (delq fixup abbrev-table-name-list)) | |
| 129 (define-abbrev-table (car fixup) (cdr fixup)))) | |
| 130 (setq l (cdr l)))) | |
| 131 ;; These are no longer initialized by C code | |
| 132 (if (not global-abbrev-table) | |
| 133 (progn | |
| 134 (setq global-abbrev-table (make-abbrev-table)) | |
| 135 (setq abbrev-table-name-list (cons 'global-abbrev-table | |
| 136 abbrev-table-name-list)))) | |
| 137 (if (not fundamental-mode-abbrev-table) | |
| 138 (progn | |
| 139 (setq fundamental-mode-abbrev-table (make-abbrev-table)) | |
| 140 (setq abbrev-table-name-list (cons 'fundamental-mode-abbrev-table | |
| 141 abbrev-table-name-list)))) | |
| 142 (and (eq major-mode 'fundamental-mode) | |
| 143 (not local-abbrev-table) | |
| 144 (setq local-abbrev-table fundamental-mode-abbrev-table))) | |
| 145 | |
| 146 | |
| 147 (defun define-global-abbrev (name expansion) | |
| 148 "Define ABBREV as a global abbreviation for EXPANSION." | |
| 149 (interactive "sDefine global abbrev: \nsExpansion for %s: ") | |
| 150 (define-abbrev global-abbrev-table | |
| 151 (downcase name) expansion nil 0)) | |
| 152 | |
| 153 (defun define-mode-abbrev (name expansion) | |
| 154 "Define ABBREV as a mode-specific abbreviation for EXPANSION." | |
| 155 (interactive "sDefine mode abbrev: \nsExpansion for %s: ") | |
| 156 (define-abbrev (or local-abbrev-table | |
| 157 (error "Major mode has no abbrev table")) | |
| 158 (downcase name) expansion nil 0)) | |
| 159 | |
| 160 (defun abbrev-symbol (abbrev &optional table) | |
| 161 "Return the symbol representing abbrev named ABBREV. | |
| 162 This symbol's name is ABBREV, but it is not the canonical symbol of that name; | |
| 163 it is interned in an abbrev-table rather than the normal obarray. | |
| 164 The value is nil if that abbrev is not defined. | |
| 165 Optional second arg TABLE is abbrev table to look it up in. | |
| 166 The default is to try buffer's mode-specific abbrev table, then global table." | |
| 167 (let ((frob (function (lambda (table) | |
| 168 (let ((sym (intern-soft abbrev table))) | |
| 169 (if (and (boundp sym) | |
| 170 (stringp (symbol-value sym))) | |
| 171 sym | |
| 172 nil)))))) | |
| 173 (if table | |
| 174 (funcall frob table) | |
| 175 (or (and local-abbrev-table | |
| 176 (funcall frob local-abbrev-table)) | |
| 177 (funcall frob global-abbrev-table))))) | |
| 178 | |
| 179 (defun abbrev-expansion (abbrev &optional table) | |
| 180 "Return the string that ABBREV expands into in the current buffer. | |
| 181 Optionally specify an abbrev table as second arg; | |
| 182 then ABBREV is looked up in that table only." | |
| 183 (let ((sym (abbrev-symbol abbrev table))) | |
| 184 (if sym | |
| 185 (symbol-value sym) | |
| 186 nil))) | |
| 187 | |
| 188 (defun unexpand-abbrev () | |
| 189 "Undo the expansion of the last abbrev that expanded. | |
| 190 This differs from ordinary undo in that other editing done since then | |
| 191 is not undone." | |
| 192 (interactive) | |
| 193 (if (or (< last-abbrev-location (point-min)) | |
| 194 (> last-abbrev-location (point-max)) | |
| 195 (not (stringp last-abbrev-text))) | |
| 196 nil | |
| 197 (let* ((opoint (point)) | |
| 198 (val (symbol-value last-abbrev)) | |
| 199 (adjust (length val))) | |
| 200 ;; This isn't correct if (symbol-function last-abbrev-text) | |
| 201 ;; was used to do the expansion | |
| 202 (goto-char last-abbrev-location) | |
| 203 (delete-region last-abbrev-location (+ last-abbrev-location adjust)) | |
| 204 (insert last-abbrev-text) | |
| 205 (setq adjust (- adjust (length last-abbrev-text))) | |
| 206 (setq last-abbrev-text nil) | |
| 207 (if (< last-abbrev-location opoint) | |
| 208 (goto-char (- opoint adjust)) | |
| 209 (goto-char opoint))))) | |
| 210 | |
| 211 | |
| 212 | |
| 444 | 213 (defun insert-abbrev-table-description (name &optional human-readable) |
| 428 | 214 "Insert before point a full description of abbrev table named NAME. |
| 215 NAME is a symbol whose value is an abbrev table. | |
| 444 | 216 If optional second argument HUMAN-READABLE is non-nil, insert a |
| 217 human-readable description. Otherwise the description is an | |
| 218 expression, a call to `define-abbrev-table', which would define the | |
| 219 abbrev table NAME exactly as it is currently defined." | |
| 428 | 220 (let ((table (symbol-value name)) |
| 221 (stream (current-buffer))) | |
| 222 (message "Abbrev-table %s..." name) | |
| 223 (if human-readable | |
| 224 (progn | |
| 225 (prin1 (list name) stream) | |
| 226 ;; Need two terpri's or cretinous edit-abbrevs blows out | |
| 227 (terpri stream) | |
| 228 (terpri stream) | |
| 229 (mapatoms (function (lambda (sym) | |
| 230 (if (symbol-value sym) | |
| 231 (let* ((n (prin1-to-string (symbol-name sym))) | |
| 232 (pos (length n))) | |
| 233 (princ n stream) | |
| 234 (while (< pos 14) | |
| 235 (write-char ?\ stream) | |
| 236 (setq pos (1+ pos))) | |
| 237 (princ (format " %-5S " (symbol-plist sym)) | |
| 238 stream) | |
| 239 (if (not (symbol-function sym)) | |
| 240 (prin1 (symbol-value sym) stream) | |
| 241 (progn | |
| 242 (setq n (prin1-to-string (symbol-value sym)) | |
| 243 pos (+ pos 6 (length n))) | |
| 244 (princ n stream) | |
| 245 (while (< pos 45) | |
| 246 (write-char ?\ stream) | |
| 247 (setq pos (1+ pos))) | |
| 248 (prin1 (symbol-function sym) stream))) | |
| 249 (terpri stream))))) | |
| 250 table) | |
| 251 (terpri stream)) | |
| 252 (progn | |
| 253 (princ "\(define-abbrev-table '" stream) | |
| 254 (prin1 name stream) | |
| 255 (princ " '\(\n" stream) | |
| 256 (mapatoms (function (lambda (sym) | |
| 257 (if (symbol-value sym) | |
| 258 (progn | |
| 259 (princ " " stream) | |
| 260 (prin1 (list (symbol-name sym) | |
| 261 (symbol-value sym) | |
| 262 (symbol-function sym) | |
| 263 (symbol-plist sym)) | |
| 264 stream) | |
| 265 (terpri stream))))) | |
| 266 table) | |
| 267 (princ " \)\)\n" stream))) | |
| 268 (terpri stream)) | |
| 269 (message "")) | |
| 270 ;;; End code not in FSF | |
| 271 | |
| 272 (defun abbrev-mode (arg) | |
| 273 "Toggle abbrev mode. | |
| 444 | 274 With argument ARG, enable abbrev mode if ARG is positive, else disable. |
| 428 | 275 In abbrev mode, inserting an abbreviation causes it to expand |
| 276 and be replaced by its expansion." | |
| 277 (interactive "P") | |
| 278 (setq abbrev-mode | |
| 279 (if (null arg) (not abbrev-mode) | |
| 280 (> (prefix-numeric-value arg) 0))) | |
| 281 ;; XEmacs change | |
| 282 (redraw-modeline)) | |
| 283 | |
| 814 | 284 ;; XEmacs change |
| 285 (defun global-abbrev-mode (arg) | |
| 286 "Toggle abbrev mode in all buffers. | |
| 287 With argument ARG, enable abbrev mode globally if ARG is positive, else | |
| 288 disable. In abbrev mode, inserting an abbreviation causes it to expand | |
| 289 and be replaced by its expansion." | |
| 290 (interactive "P") | |
| 291 (let ((newval (if (null arg) (not abbrev-mode) | |
| 292 (> (prefix-numeric-value arg) 0)))) | |
| 293 (setq-default abbrev-mode newval) | |
| 294 (loop for buf being the buffers do | |
| 295 (if (not (eq (symbol-value-in-buffer 'abbrev-mode buf) newval)) | |
| 296 (with-current-buffer buf | |
| 297 (setq abbrev-mode newval))))) | |
| 298 (redraw-modeline)) | |
| 299 | |
| 428 | 300 |
| 301 (defvar edit-abbrevs-map nil | |
| 302 "Keymap used in edit-abbrevs.") | |
| 303 (if edit-abbrevs-map | |
| 304 nil | |
| 305 (setq edit-abbrevs-map (make-sparse-keymap)) | |
| 306 ;; XEmacs change | |
| 307 (set-keymap-name edit-abbrevs-map 'edit-abbrevs-map) | |
| 308 (define-key edit-abbrevs-map "\C-x\C-s" 'edit-abbrevs-redefine) | |
| 309 (define-key edit-abbrevs-map "\C-c\C-c" 'edit-abbrevs-redefine)) | |
| 310 | |
| 311 (defun kill-all-abbrevs () | |
| 312 "Undefine all defined abbrevs." | |
| 313 (interactive) | |
| 314 (let ((tables abbrev-table-name-list)) | |
| 315 (while tables | |
| 316 (clear-abbrev-table (symbol-value (car tables))) | |
| 317 (setq tables (cdr tables))))) | |
| 318 | |
| 319 (defun insert-abbrevs () | |
| 320 "Insert after point a description of all defined abbrevs. | |
| 321 Mark is set after the inserted text." | |
| 322 (interactive) | |
| 323 (push-mark | |
| 324 (save-excursion | |
| 325 (let ((tables abbrev-table-name-list)) | |
| 326 (while tables | |
| 327 (insert-abbrev-table-description (car tables) t) | |
| 328 (setq tables (cdr tables)))) | |
| 329 (point)))) | |
| 330 | |
| 331 (defun list-abbrevs () | |
| 332 "Display a list of all defined abbrevs." | |
| 333 (interactive) | |
| 334 (display-buffer (prepare-abbrev-list-buffer))) | |
| 335 | |
| 336 (defun prepare-abbrev-list-buffer () | |
| 337 (save-excursion | |
| 338 (set-buffer (get-buffer-create "*Abbrevs*")) | |
| 339 (erase-buffer) | |
| 340 (let ((tables abbrev-table-name-list)) | |
| 341 (while tables | |
| 342 (insert-abbrev-table-description (car tables) t) | |
| 343 (setq tables (cdr tables)))) | |
| 344 (goto-char (point-min)) | |
| 345 (set-buffer-modified-p nil) | |
| 346 (edit-abbrevs-mode)) | |
| 347 (get-buffer-create "*Abbrevs*")) | |
| 348 | |
| 349 (defun edit-abbrevs-mode () | |
| 350 "Major mode for editing the list of abbrev definitions. | |
| 351 \\{edit-abbrevs-map}" | |
| 352 (interactive) | |
| 353 (setq major-mode 'edit-abbrevs-mode) | |
| 354 (setq mode-name "Edit-Abbrevs") | |
| 355 (use-local-map edit-abbrevs-map)) | |
| 356 | |
| 357 (defun edit-abbrevs () | |
| 358 "Alter abbrev definitions by editing a list of them. | |
| 359 Selects a buffer containing a list of abbrev definitions. | |
| 360 You can edit them and type \\<edit-abbrevs-map>\\[edit-abbrevs-redefine] to redefine abbrevs | |
| 361 according to your editing. | |
| 362 Buffer contains a header line for each abbrev table, | |
| 363 which is the abbrev table name in parentheses. | |
| 364 This is followed by one line per abbrev in that table: | |
| 365 NAME USECOUNT EXPANSION HOOK | |
| 366 where NAME and EXPANSION are strings with quotes, | |
| 367 USECOUNT is an integer, and HOOK is any valid function | |
| 368 or may be omitted (it is usually omitted)." | |
| 369 (interactive) | |
| 370 (switch-to-buffer (prepare-abbrev-list-buffer))) | |
| 371 | |
| 372 (defun edit-abbrevs-redefine () | |
| 373 "Redefine abbrevs according to current buffer contents." | |
| 374 (interactive) | |
| 375 (define-abbrevs t) | |
| 376 (set-buffer-modified-p nil)) | |
| 377 | |
| 378 (defun define-abbrevs (&optional arg) | |
| 379 "Define abbrevs according to current visible buffer contents. | |
| 380 See documentation of `edit-abbrevs' for info on the format of the | |
| 381 text you must have in the buffer. | |
| 382 With argument, eliminate all abbrev definitions except | |
| 383 the ones defined from the buffer now." | |
| 384 (interactive "P") | |
| 385 (if arg (kill-all-abbrevs)) | |
| 386 (save-excursion | |
| 387 (goto-char (point-min)) | |
| 388 (while (and (not (eobp)) (re-search-forward "^(" nil t)) | |
| 389 (let* ((buf (current-buffer)) | |
| 390 (table (read buf)) | |
| 391 abbrevs name hook exp count) | |
| 392 (forward-line 1) | |
| 393 (while (progn (forward-line 1) | |
| 394 (not (eolp))) | |
| 395 (setq name (read buf) count (read buf) exp (read buf)) | |
| 396 (skip-chars-backward " \t\n\f") | |
| 397 (setq hook (if (not (eolp)) (read buf))) | |
| 398 (skip-chars-backward " \t\n\f") | |
| 399 (setq abbrevs (cons (list name exp hook count) abbrevs))) | |
| 400 (define-abbrev-table table abbrevs))))) | |
| 401 | |
| 402 (defun read-abbrev-file (&optional file quietly) | |
| 403 "Read abbrev definitions from file written with `write-abbrev-file'. | |
| 404 Optional argument FILE is the name of the file to read; | |
| 405 it defaults to the value of `abbrev-file-name'. | |
| 406 Optional second argument QUIETLY non-nil means don't print anything." | |
| 407 (interactive "fRead abbrev file: ") | |
| 408 (load (if (and file (> (length file) 0)) file abbrev-file-name) | |
| 409 nil quietly) | |
| 410 (setq save-abbrevs t abbrevs-changed nil)) | |
| 411 | |
| 412 (defun quietly-read-abbrev-file (&optional file) | |
| 444 | 413 "Read abbrev definitions from file written with `write-abbrev-file'. |
| 428 | 414 Optional argument FILE is the name of the file to read; |
| 415 it defaults to the value of `abbrev-file-name'. | |
| 416 Does not print anything." | |
| 417 ;(interactive "fRead abbrev file: ") | |
| 418 (read-abbrev-file file t)) | |
| 419 | |
| 420 (defun write-abbrev-file (file) | |
| 421 "Write all abbrev definitions to a file of Lisp code. | |
| 422 The file written can be loaded in another session to define the same abbrevs. | |
| 423 The argument FILE is the file name to write." | |
| 424 (interactive | |
| 425 (list | |
| 426 (read-file-name "Write abbrev file: " | |
| 427 (file-name-directory (expand-file-name abbrev-file-name)) | |
| 428 abbrev-file-name))) | |
| 429 (or (and file (> (length file) 0)) | |
| 430 (setq file abbrev-file-name)) | |
| 431 (save-excursion | |
| 432 (set-buffer (get-buffer-create " write-abbrev-file")) | |
| 433 (erase-buffer) | |
| 434 (let ((tables abbrev-table-name-list)) | |
| 435 (while tables | |
| 436 (insert-abbrev-table-description (car tables) nil) | |
| 437 (setq tables (cdr tables)))) | |
| 438 (write-region 1 (point-max) file) | |
| 439 (erase-buffer))) | |
| 440 | |
| 442 | 441 (defun abbrev-string-to-be-defined (arg) |
| 442 "Return the string for which an abbrev will be defined. | |
| 443 ARG is the argument to `add-global-abbrev' or `add-mode-abbrev'." | |
| 444 (if (and (not arg) (region-active-p)) (setq arg 0) | |
| 445 (setq arg (prefix-numeric-value arg))) | |
| 446 (and (>= arg 0) | |
| 447 (buffer-substring | |
| 448 (point) | |
| 449 (if (= arg 0) (mark) | |
| 446 | 450 (save-excursion (backward-word arg) (point)))))) |
| 442 | 451 |
| 428 | 452 (defun add-mode-abbrev (arg) |
| 814 | 453 "Define mode-specific abbrev for region or last word(s) before point. |
| 454 If region active, use it as the expansion\; otherwise, choose the word | |
| 455 before point. A prefix argument specifies the number of words before point | |
| 456 that form the expansion; or zero means the text between point and mark is | |
| 457 the expansion. A negative argument means to undefine the specified abbrev. | |
| 458 This command uses the minibuffer to read the abbreviation. | |
| 428 | 459 |
| 460 Don't use this function in a Lisp program; use `define-abbrev' instead." | |
| 461 ;; XEmacs change: | |
| 462 (interactive "P") | |
| 463 (add-abbrev | |
| 464 (if only-global-abbrevs | |
| 465 global-abbrev-table | |
| 466 (or local-abbrev-table | |
| 467 (error "No per-mode abbrev table"))) | |
| 814 | 468 "Mode" arg) |
| 469 (if defining-abbrev-turns-on-abbrev-mode (abbrev-mode 1))) | |
| 428 | 470 |
| 471 (defun add-global-abbrev (arg) | |
| 814 | 472 "Define global (all modes) abbrev for region or last word(s) before point. |
| 473 If region active, use it as the expansion\; otherwise, choose the word | |
| 474 before point. A prefix argument specifies the number of words before point | |
| 475 that form the expansion; or zero means the text between point and mark is | |
| 476 the expansion. A negative argument means to undefine the specified abbrev. | |
| 428 | 477 This command uses the minibuffer to read the abbreviation. |
| 478 | |
| 479 Don't use this function in a Lisp program; use `define-abbrev' instead." | |
| 480 ;; XEmacs change: | |
| 481 (interactive "P") | |
| 814 | 482 (add-abbrev global-abbrev-table "Global" arg) |
| 483 (if defining-abbrev-turns-on-abbrev-mode (global-abbrev-mode 1))) | |
| 428 | 484 |
| 485 (defun add-abbrev (table type arg) | |
| 444 | 486 "Add an abbreviation to abbrev table TABLE. |
| 487 TYPE is a string describing in English the kind of abbrev this will be | |
| 488 (typically, \"global\" or \"mode-specific\"); this is used in | |
| 489 prompting the user. ARG is the number of words in the expansion. | |
| 490 | |
| 491 Return the symbol that internally represents the new abbrev, or nil if | |
| 492 the user declines to confirm redefining an existing abbrev." | |
| 428 | 493 ;; XEmacs change: |
| 442 | 494 (let ((exp (abbrev-string-to-be-defined arg)) |
| 428 | 495 name) |
| 496 (setq name | |
| 497 (read-string (format (if exp "%s abbrev for \"%s\": " | |
| 498 "Undefine %s abbrev: ") | |
| 499 type exp))) | |
| 500 (set-text-properties 0 (length name) nil name) | |
| 501 (if (or (null exp) | |
| 502 (not (abbrev-expansion name table)) | |
| 503 (y-or-n-p (format "%s expands to \"%s\"; redefine? " | |
| 504 name (abbrev-expansion name table)))) | |
| 505 (define-abbrev table (downcase name) exp)))) | |
| 506 | |
| 442 | 507 (defun inverse-abbrev-string-to-be-defined (arg) |
| 508 "Return the string for which an inverse abbrev will be defined. | |
| 509 ARG is the argument to `inverse-add-global-abbrev' or | |
| 510 `inverse-add-mode-abbrev'." | |
| 511 (save-excursion | |
| 446 | 512 (backward-word arg) |
| 442 | 513 (buffer-substring (point) (progn (forward-word 1) (point))))) |
| 514 | |
| 428 | 515 (defun inverse-add-mode-abbrev (arg) |
| 516 "Define last word before point as a mode-specific abbrev. | |
| 517 With prefix argument N, defines the Nth word before point. | |
| 518 This command uses the minibuffer to read the expansion. | |
| 519 Expands the abbreviation after defining it." | |
| 520 (interactive "p") | |
| 521 (inverse-add-abbrev | |
| 522 (if only-global-abbrevs | |
| 523 global-abbrev-table | |
| 524 (or local-abbrev-table | |
| 525 (error "No per-mode abbrev table"))) | |
| 814 | 526 "Mode" arg) |
| 527 (if defining-abbrev-turns-on-abbrev-mode (abbrev-mode 1))) | |
| 428 | 528 |
| 529 (defun inverse-add-global-abbrev (arg) | |
| 530 "Define last word before point as a global (mode-independent) abbrev. | |
| 531 With prefix argument N, defines the Nth word before point. | |
| 532 This command uses the minibuffer to read the expansion. | |
| 533 Expands the abbreviation after defining it." | |
| 534 (interactive "p") | |
| 814 | 535 (inverse-add-abbrev global-abbrev-table "Global" arg) |
| 536 (if defining-abbrev-turns-on-abbrev-mode (global-abbrev-mode 1))) | |
| 428 | 537 |
| 538 (defun inverse-add-abbrev (table type arg) | |
| 539 (let (name nameloc exp) | |
| 540 (save-excursion | |
| 446 | 541 (backward-word arg) |
| 428 | 542 (setq name (buffer-substring (point) (progn (forward-word 1) |
| 543 (setq nameloc (point)))))) | |
| 544 (set-text-properties 0 (length name) nil name) | |
| 545 (setq exp (read-string (format "%s expansion for \"%s\": " | |
| 546 type name))) | |
| 547 (if (or (not (abbrev-expansion name table)) | |
| 548 (y-or-n-p (format "%s expands to \"%s\"; redefine? " | |
| 549 name (abbrev-expansion name table)))) | |
| 550 (progn | |
| 551 (define-abbrev table (downcase name) exp) | |
| 552 (save-excursion | |
| 553 (goto-char nameloc) | |
| 554 (expand-abbrev)))))) | |
| 555 | |
| 556 (defun abbrev-prefix-mark (&optional arg) | |
| 557 "Mark current point as the beginning of an abbrev. | |
| 558 Abbrev to be expanded starts here rather than at beginning of word. | |
| 559 This way, you can expand an abbrev with a prefix: insert the prefix, | |
| 560 use this command, then insert the abbrev." | |
| 561 (interactive "P") | |
| 562 (or arg (expand-abbrev)) | |
| 563 (setq abbrev-start-location (point-marker) | |
| 564 abbrev-start-location-buffer (current-buffer)) | |
| 565 (let ((e (make-extent (point) (point)))) | |
| 566 (set-extent-begin-glyph e (make-glyph [string :data "-"])))) | |
| 567 | |
| 568 (defun expand-region-abbrevs (start end &optional noquery) | |
| 569 "For abbrev occurrence in the region, offer to expand it. | |
| 570 The user is asked to type y or n for each occurrence. | |
| 571 A prefix argument means don't query; expand all abbrevs. | |
| 572 If called from a Lisp program, arguments are START END &optional NOQUERY." | |
| 573 (interactive "r\nP") | |
| 574 (save-excursion | |
| 575 (goto-char start) | |
| 576 (let ((lim (- (point-max) end)) | |
| 577 pnt string) | |
| 578 (while (and (not (eobp)) | |
| 579 (progn (forward-word 1) | |
| 580 (<= (setq pnt (point)) (- (point-max) lim)))) | |
| 581 (if (abbrev-expansion | |
| 582 (setq string | |
| 583 (buffer-substring | |
| 446 | 584 (save-excursion (backward-word) (point)) |
| 428 | 585 pnt))) |
| 586 (if (or noquery (y-or-n-p (format "Expand `%s'? " string))) | |
| 587 (expand-abbrev))))))) | |
| 588 | |
| 589 ;;; abbrev.el ends here |