Mercurial > hg > xemacs-beta
annotate lisp/cmdloop.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 | 37bdd24225ef |
children | 1b0339b048ce |
rev | line source |
---|---|
428 | 1 ;;; cmdloop.el --- support functions for the top-level command loop. |
2 | |
3 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. | |
1123 | 4 ;; Copyright (C) 2001, 2002 Ben Wing. |
428 | 5 |
6 ;; Author: Richard Mlynarik | |
7 ;; Date: 8-Jul-92 | |
8 ;; Maintainer: XEmacs Development Team | |
9 ;; Keywords: internal, dumped | |
10 | |
11 ;; This file is part of XEmacs. | |
12 | |
13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
14 ;; under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
17 | |
18 ;; XEmacs is distributed in the hope that it will be useful, but | |
19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
21 ;; General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
25 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
27 | |
28 ;;; Synched up with: FSF 19.30. (Some of the stuff below is in FSF's subr.el.) | |
29 | |
30 ;;; Commentary: | |
31 | |
32 ;; This file is dumped with XEmacs. | |
33 | |
34 ;;; Code: | |
35 | |
36 (defun recursion-depth () | |
37 "Return the current depth in recursive edits." | |
38 (+ command-loop-level (minibuffer-depth))) | |
39 | |
40 (defun top-level () | |
41 "Exit all recursive editing levels." | |
42 (interactive) | |
43 (throw 'top-level nil)) | |
44 | |
45 (defun exit-recursive-edit () | |
46 "Exit from the innermost recursive edit or minibuffer." | |
47 (interactive) | |
48 (if (> (recursion-depth) 0) | |
49 (throw 'exit nil)) | |
50 (error "No recursive edit is in progress")) | |
51 | |
52 (defun abort-recursive-edit () | |
53 "Abort the command that requested this recursive edit or minibuffer input." | |
54 (interactive) | |
55 (if (> (recursion-depth) 0) | |
56 (throw 'exit t)) | |
57 (error "No recursive edit is in progress")) | |
58 | |
59 ;; (defun keyboard-quit () | |
60 ;; "Signal a `quit' condition." | |
61 ;; (interactive) | |
62 ;; (deactivate-mark) | |
63 ;; (signal 'quit nil)) | |
64 | |
65 ;; moved here from pending-del. | |
66 (defun keyboard-quit () | |
67 "Signal a `quit' condition. | |
68 If this character is typed while lisp code is executing, it will be treated | |
69 as an interrupt. | |
70 If this character is typed at top-level, this simply beeps. | |
71 If `zmacs-regions' is true, and the zmacs region is active in this buffer, | |
72 then this key deactivates the region without beeping or signalling." | |
73 (interactive) | |
74 (if (and (region-active-p) | |
75 (eq (current-buffer) (zmacs-region-buffer))) | |
76 ;; pseudo-zmacs compatibility: don't beep if this ^G is simply | |
77 ;; deactivating the region. If it is inactive, beep. | |
78 nil | |
79 (signal 'quit nil))) | |
80 | |
81 (defvar buffer-quit-function nil | |
82 "Function to call to \"quit\" the current buffer, or nil if none. | |
83 \\[keyboard-escape-quit] calls this function when its more local actions | |
84 \(such as cancelling a prefix argument, minibuffer or region) do not apply.") | |
85 | |
86 (defun keyboard-escape-quit () | |
87 "Exit the current \"mode\" (in a generalized sense of the word). | |
88 This command can exit an interactive command such as `query-replace', | |
89 can clear out a prefix argument or a region, | |
90 can get out of the minibuffer or other recursive edit, | |
91 cancel the use of the current buffer (for special-purpose buffers), | |
92 or go back to just one window (by deleting all but the selected window)." | |
93 (interactive) | |
94 (cond ((eq last-command 'mode-exited) nil) | |
95 ((> (minibuffer-depth) 0) | |
96 (abort-recursive-edit)) | |
97 (current-prefix-arg | |
98 nil) | |
99 ((region-active-p) | |
100 (zmacs-deactivate-region)) | |
101 ((> (recursion-depth) 0) | |
102 (exit-recursive-edit)) | |
103 (buffer-quit-function | |
104 (funcall buffer-quit-function)) | |
105 ((not (one-window-p t)) | |
106 (delete-other-windows)) | |
107 ((string-match "^ \\*" (buffer-name (current-buffer))) | |
108 (bury-buffer)))) | |
109 | |
110 ;; `cancel-mode-internal' is a function of a misc-user event, which is | |
111 ;; queued when window system directs XEmacs frame to cancel any modal | |
112 ;; behavior it exposes, like mouse pointer grabbing. | |
113 ;; | |
114 ;; This function does nothing at the top level, but the code which | |
115 ;; runs modal event loops, such as selection drag loop in `mouse-track', | |
116 ;; check if misc-user function symbol is `cancel-mode-internal', and | |
117 ;; takes necessary cleanup actions. | |
118 (defun cancel-mode-internal (object) | |
119 (setq zmacs-region-stays t)) | |
120 | |
121 ;; Someone wrote: "This should really be a ring of last errors." | |
122 ;; | |
123 ;; But why bother? This stuff is not all that necessary now that we | |
124 ;; have message log, anyway. | |
125 (defvar last-error nil | |
126 "Object describing the last signaled error.") | |
127 | |
128 (defcustom errors-deactivate-region nil | |
129 "*Non-nil means that errors will cause the region to be deactivated." | |
130 :type 'boolean | |
131 :group 'editing-basics) | |
132 | |
133 (defun command-error (error-object) | |
771 | 134 ;; if you want a backtrace before exiting, set stack-trace-on-error. |
135 (let* ((inhibit-quit t) | |
442 | 136 (debug-on-error nil) |
137 (etype (car-safe error-object))) | |
428 | 138 (setq quit-flag nil) |
139 (setq standard-output t) | |
140 (setq standard-input t) | |
141 (setq executing-kbd-macro nil) | |
142 (and errors-deactivate-region | |
143 (zmacs-deactivate-region)) | |
144 (discard-input) | |
145 | |
146 (setq last-error error-object) | |
147 | |
148 (message nil) | |
149 (ding nil (cond ((eq etype 'undefined-keystroke-sequence) | |
150 (if (and (vectorp (nth 1 error-object)) | |
151 (/= 0 (length (nth 1 error-object))) | |
152 (button-event-p (aref (nth 1 error-object) 0))) | |
153 'undefined-click | |
154 'undefined-key)) | |
155 ((eq etype 'quit) | |
156 'quit) | |
157 ((memq etype '(end-of-buffer beginning-of-buffer)) | |
158 'buffer-bound) | |
159 ((eq etype 'buffer-read-only) | |
160 'read-only) | |
161 (t 'command-error))) | |
162 (display-error error-object t) | |
163 | |
164 (if (noninteractive) | |
165 (progn | |
1123 | 166 (message "%s exiting.\n" emacs-program-name) |
428 | 167 (kill-emacs -1))) |
168 t)) | |
169 | |
170 (defun describe-last-error () | |
171 "Redisplay the last error-message. See the variable `last-error'." | |
172 (interactive) | |
173 (if last-error | |
174 (with-displaying-help-buffer | |
175 (lambda () | |
176 (princ "Last error was:\n" standard-output) | |
177 (display-error last-error standard-output))) | |
178 (message "No error yet"))) | |
179 | |
180 | |
181 ;;#### Must be done later in the loadup sequence | |
182 ;(define-key (symbol-function 'help-command) "e" 'describe-last-error) | |
183 | |
184 | |
185 (defun truncate-command-history-for-gc () | |
186 (let ((tail (nthcdr 30 command-history))) | |
187 (if tail (setcdr tail nil))) | |
188 (let ((tail (nthcdr 30 values))) | |
189 (if tail (setcdr tail nil))) | |
190 ) | |
191 | |
192 (add-hook 'pre-gc-hook 'truncate-command-history-for-gc) | |
193 | |
194 | |
195 ;;;; Object-oriented programming at its finest | |
196 | |
197 ;; Now in src/print.c; used by Ferror_message_string and others | |
198 ;(defun display-error (error-object stream) ;(defgeneric report-condition ...) | |
199 ; "Display `error-object' on `stream' in a user-friendly way." | |
200 ; (funcall (or (let ((type (car-safe error-object))) | |
201 ; (catch 'error | |
202 ; (and (consp error-object) | |
203 ; (symbolp type) | |
204 ; ;;(stringp (get type 'error-message)) | |
205 ; (consp (get type 'error-conditions)) | |
206 ; (let ((tail (cdr error-object))) | |
207 ; (while (not (null tail)) | |
208 ; (if (consp tail) | |
209 ; (setq tail (cdr tail)) | |
210 ; (throw 'error nil))) | |
211 ; t) | |
212 ; ;; (check-type condition condition) | |
213 ; (get type 'error-conditions) | |
214 ; ;; Search class hierarchy | |
215 ; (let ((tail (get type 'error-conditions))) | |
216 ; (while (not (null tail)) | |
217 ; (cond ((not (and (consp tail) | |
218 ; (symbolp (car tail)))) | |
219 ; (throw 'error nil)) | |
220 ; ((get (car tail) 'display-error) | |
221 ; (throw 'error (get (car tail) | |
222 ; 'display-error))) | |
223 ; (t | |
224 ; (setq tail (cdr tail))))) | |
225 ; ;; Default method | |
226 ; #'(lambda (error-object stream) | |
227 ; (let ((type (car error-object)) | |
228 ; (tail (cdr error-object)) | |
229 ; (first t) | |
230 ; (print-message-label 'error)) | |
231 ; (if (eq type 'error) | |
232 ; (progn (princ (car tail) stream) | |
233 ; (setq tail (cdr tail))) | |
234 ; (princ (or (gettext (get type 'error-message)) type) | |
235 ; stream)) | |
236 ; (while tail | |
237 ; (princ (if first ": " ", ") stream) | |
238 ; (prin1 (car tail) stream) | |
239 ; (setq tail (cdr tail) | |
240 ; first nil)))))))) | |
241 ; #'(lambda (error-object stream) | |
242 ; (princ (gettext "Peculiar error ") stream) | |
243 ; (prin1 error-object stream))) | |
244 ; error-object stream)) | |
245 | |
246 (put 'file-error 'display-error | |
247 #'(lambda (error-object stream) | |
248 (let ((tail (cdr error-object)) | |
249 (first t)) | |
250 (princ (car tail) stream) | |
251 (while (setq tail (cdr tail)) | |
252 (princ (if first ": " ", ") stream) | |
253 (princ (car tail) stream) | |
254 (setq first nil))))) | |
255 | |
256 (put 'undefined-keystroke-sequence 'display-error | |
257 #'(lambda (error-object stream) | |
258 (princ (key-description (car (cdr error-object))) stream) | |
259 ;; #### I18N3: doesn't localize properly. | |
260 (princ (gettext " not defined.") stream) ; doo dah, doo dah. | |
261 )) | |
262 | |
263 | |
264 (defcustom teach-extended-commands-p t | |
265 "*If true, then `\\[execute-extended-command]' will teach you keybindings. | |
266 Any time you execute a command with \\[execute-extended-command] which has a | |
267 shorter keybinding, you will be shown the alternate binding before the | |
268 command executes. There is a short pause after displaying the binding, | |
269 before executing it; the length can be controlled by | |
270 `teach-extended-commands-timeout'." | |
271 :type 'boolean | |
272 :group 'keyboard) | |
273 | |
274 (defcustom teach-extended-commands-timeout 4 | |
275 "*How long to pause after displaying a keybinding before executing. | |
276 The value is measured in seconds. This only applies if | |
277 `teach-extended-commands-p' is true." | |
278 :type 'number | |
279 :group 'keyboard) | |
280 | |
281 ;That damn RMS went off and implemented something differently, after | |
282 ;we had already implemented it. We can't support both properly until | |
283 ;we have Lisp magic variables. | |
284 ;(defvar suggest-key-bindings t | |
285 ; "*FSFmacs equivalent of `teach-extended-commands-*'. | |
286 ;Provided for compatibility only. | |
287 ;Non-nil means show the equivalent key-binding when M-x command has one. | |
288 ;The value can be a length of time to show the message for. | |
289 ;If the value is non-nil and not a number, we wait 2 seconds.") | |
290 ; | |
291 ;(make-obsolete-variable 'suggest-key-bindings 'teach-extended-commands-p) | |
292 | |
293 (defun execute-extended-command (prefix-arg) | |
294 "Read a command name from the minibuffer using 'completing-read'. | |
295 Then call the specified command using 'command-execute' and return its | |
296 return value. If the command asks for a prefix argument, supply the | |
297 value of the current raw prefix argument, or the value of PREFIX-ARG | |
298 when called from Lisp." | |
299 (interactive "P") | |
300 ;; Note: This doesn't hack "this-command-keys" | |
301 (let ((prefix-arg prefix-arg)) | |
302 (setq this-command (read-command | |
303 ;; Note: this has the hard-wired | |
304 ;; "C-u" and "M-x" string bug in common | |
613 | 305 ;; with all Emacs's. |
428 | 306 ;; (i.e. it prints C-u and M-x regardless of |
307 ;; whether some other keys were actually bound | |
308 ;; to `execute-extended-command' and | |
309 ;; `universal-argument'. | |
310 (cond ((eq prefix-arg '-) | |
311 "- M-x ") | |
312 ((equal prefix-arg '(4)) | |
313 "C-u M-x ") | |
314 ((integerp prefix-arg) | |
315 (format "%d M-x " prefix-arg)) | |
316 ((and (consp prefix-arg) | |
317 (integerp (car prefix-arg))) | |
318 (format "%d M-x " (car prefix-arg))) | |
319 (t | |
320 "M-x "))))) | |
321 | |
322 (if (and teach-extended-commands-p | |
323 (interactive-p)) | |
324 ;; Remember the keys, run the command, and show the keys (if | |
325 ;; any). The funny variable names are a poor man's guarantee | |
326 ;; that we don't get tripped by this-command doing something | |
327 ;; funny. Quoth our forefathers: "We want lexical scope!" | |
328 (let ((_execute_command_keys_ (where-is-internal this-command)) | |
329 (_execute_command_name_ this-command)) ; the name can change | |
330 (command-execute this-command t) | |
331 (when _execute_command_keys_ | |
332 ;; Normally the region is adjusted in post_command_hook; | |
333 ;; however, it is not called until after we finish. It | |
334 ;; looks ugly for the region to get updated after the | |
335 ;; delays, so we do it now. The code below is a Lispified | |
336 ;; copy of code in event-stream.c:post_command_hook(). | |
337 (if (and (not zmacs-region-stays) | |
338 (or (not (eq (selected-window) (minibuffer-window))) | |
339 (eq (zmacs-region-buffer) (current-buffer)))) | |
340 (zmacs-deactivate-region) | |
341 (zmacs-update-region)) | |
342 ;; Wait for a while, so the user can see a message printed, | |
343 ;; if any. | |
344 (when (sit-for 1) | |
345 (display-message | |
346 'no-log | |
347 (format (if (cdr _execute_command_keys_) | |
348 "Command `%s' is bound to keys: %s" | |
349 "Command `%s' is bound to key: %s") | |
350 _execute_command_name_ | |
351 (sorted-key-descriptions _execute_command_keys_))) | |
352 (sit-for teach-extended-commands-timeout) | |
353 (clear-message 'no-log)))) | |
354 ;; Else, just run the command. | |
355 (command-execute this-command t))) | |
356 | |
357 | |
358 ;;; C code calls this; the underscores in the variable names are to avoid | |
359 ;;; cluttering the specbind namespace (lexical scope! lexical scope!) | |
360 ;;; Putting this in Lisp instead of C slows kbd macros by 50%. | |
361 ;(defun command-execute (_command &optional _record-flag) | |
362 ; "Execute CMD as an editor command. | |
363 ;CMD must be a symbol that satisfies the `commandp' predicate. | |
364 ;Optional second arg RECORD-FLAG non-nil | |
365 ;means unconditionally put this command in `command-history'. | |
366 ;Otherwise, that is done only if an arg is read using the minibuffer." | |
367 ; (let ((_prefix prefix-arg) | |
368 ; (_cmd (indirect-function _command))) | |
369 ; (setq prefix-arg nil | |
370 ; this-command _command | |
371 ; current-prefix-arg _prefix | |
372 ; zmacs-region-stays nil) | |
373 ; ;; #### debug_on_next_call = 0; | |
374 ; (cond ((and (symbolp _command) | |
375 ; (get _command 'disabled)) | |
376 ; (run-hooks disabled-command-hook)) | |
377 ; ((or (stringp _cmd) (vectorp _cmd)) | |
378 ; ;; If requested, place the macro in the command history. | |
379 ; ;; For other sorts of commands, call-interactively takes | |
380 ; ;; care of this. | |
381 ; (if _record-flag | |
382 ; (setq command-history | |
383 ; (cons (list 'execute-kbd-macro _cmd _prefix) | |
384 ; command-history))) | |
385 ; (execute-kbd-macro _cmd _prefix)) | |
386 ; (t | |
387 ; (call-interactively _command _record-flag))))) | |
388 | |
389 (defun y-or-n-p-minibuf (prompt) | |
390 "Ask user a \"y or n\" question. Return t if answer is \"y\". | |
391 Takes one argument, which is the string to display to ask the question. | |
392 It should end in a space; `y-or-n-p' adds `(y or n) ' to it. | |
393 No confirmation of the answer is requested; a single character is enough. | |
394 Also accepts Space to mean yes, or Delete to mean no." | |
395 (save-excursion | |
396 (let* ((pre "") | |
397 (yn (gettext "(y or n) ")) | |
398 ;; we need to translate the prompt ourselves because of the | |
399 ;; strange way we handle it. | |
400 (prompt (gettext prompt)) | |
401 event) | |
402 (while (stringp yn) | |
403 (if (let ((cursor-in-echo-area t) | |
404 (inhibit-quit t)) | |
405 (message "%s%s%s" pre prompt yn) | |
406 (setq event (next-command-event event)) | |
407 (condition-case nil | |
408 (prog1 | |
409 (or quit-flag (eq 'keyboard-quit (key-binding event))) | |
410 (setq quit-flag nil)) | |
411 (wrong-type-argument t))) | |
412 (progn | |
413 (message "%s%s%s%s" pre prompt yn (single-key-description event)) | |
414 (setq quit-flag nil) | |
415 (signal 'quit '()))) | |
416 (let* ((keys (events-to-keys (vector event))) | |
417 (def (lookup-key query-replace-map keys))) | |
418 (cond ((eq def 'skip) | |
419 (message "%s%sNo" prompt yn) | |
420 (setq yn nil)) | |
421 ((eq def 'act) | |
422 (message "%s%sYes" prompt yn) | |
423 (setq yn t)) | |
424 ((eq def 'recenter) | |
425 (recenter)) | |
426 ((or (eq def 'quit) (eq def 'exit-prefix)) | |
427 (signal 'quit '())) | |
428 ((button-release-event-p event) ; ignore them | |
429 nil) | |
430 (t | |
431 (message "%s%s%s%s" pre prompt yn | |
432 (single-key-description event)) | |
433 (ding nil 'y-or-n-p) | |
434 (discard-input) | |
435 (if (= (length pre) 0) | |
436 (setq pre (gettext "Please answer y or n. "))))))) | |
437 yn))) | |
438 | |
439 (defun yes-or-no-p-minibuf (prompt) | |
440 "Ask user a yes-or-no question. Return t if answer is yes. | |
441 Takes one argument, which is the string to display to ask the question. | |
442 It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it. | |
443 The user must confirm the answer with RET, | |
444 and can edit it until it has been confirmed." | |
445 (save-excursion | |
446 (let ((p (concat (gettext prompt) (gettext "(yes or no) "))) | |
447 (ans "")) | |
448 (while (stringp ans) | |
449 (setq ans (downcase (read-string p nil t))) ;no history | |
450 (cond ((string-equal ans (gettext "yes")) | |
451 (setq ans t)) | |
452 ((string-equal ans (gettext "no")) | |
453 (setq ans nil)) | |
454 (t | |
455 (ding nil 'yes-or-no-p) | |
456 (discard-input) | |
457 (message "Please answer yes or no.") | |
458 (sleep-for 2)))) | |
459 ans))) | |
460 | |
442 | 461 (defun yes-or-no-p (prompt) |
462 "Ask user a yes-or-no question. Return t if answer is yes. | |
463 The question is asked with a dialog box or the minibuffer, as appropriate. | |
464 Takes one argument, which is the string to display to ask the question. | |
465 It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it. | |
466 The user must confirm the answer with RET, | |
467 and can edit it until it as been confirmed." | |
468 (if (should-use-dialog-box-p) | |
469 (yes-or-no-p-dialog-box prompt) | |
470 (yes-or-no-p-minibuf prompt))) | |
471 | |
472 (defun y-or-n-p (prompt) | |
473 "Ask user a \"y or n\" question. Return t if answer is \"y\". | |
474 Takes one argument, which is the string to display to ask the question. | |
475 The question is asked with a dialog box or the minibuffer, as appropriate. | |
476 It should end in a space; `y-or-n-p' adds `(y or n) ' to it. | |
477 No confirmation of the answer is requested; a single character is enough. | |
478 Also accepts Space to mean yes, or Delete to mean no." | |
479 (if (should-use-dialog-box-p) | |
480 (yes-or-no-p-dialog-box prompt) | |
481 (y-or-n-p-minibuf prompt))) | |
482 | |
428 | 483 |
484 | |
485 (defun read-char () | |
486 "Read a character from the command input (keyboard or macro). | |
487 If a mouse click or non-ASCII character is detected, an error is | |
488 signalled. The character typed is returned as an ASCII value. This | |
489 is most likely the wrong thing for you to be using: consider using | |
490 the `next-command-event' function instead." | |
491 (save-excursion | |
492 (let ((event (next-command-event))) | |
493 (or inhibit-quit | |
494 (and (event-matches-key-specifier-p event (quit-char)) | |
495 (signal 'quit nil))) | |
496 (prog1 (or (event-to-character event) | |
497 ;; Kludge. If the event we read was a mouse-release, | |
498 ;; discard it and read the next one. | |
499 (if (button-release-event-p event) | |
500 (event-to-character (next-command-event event))) | |
501 (error "Key read has no ASCII equivalent %S" event)) | |
502 ;; this is not necessary, but is marginally more efficient than GC. | |
503 (deallocate-event event))))) | |
504 | |
505 (defun read-char-exclusive () | |
506 "Read a character from the command input (keyboard or macro). | |
507 If a mouse click or non-ASCII character is detected, it is discarded. | |
508 The character typed is returned as an ASCII value. This is most likely | |
509 the wrong thing for you to be using: consider using the | |
510 `next-command-event' function instead." | |
511 (let (event ch) | |
512 (while (progn | |
513 (setq event (next-command-event)) | |
514 (or inhibit-quit | |
515 (and (event-matches-key-specifier-p event (quit-char)) | |
516 (signal 'quit nil))) | |
517 (setq ch (event-to-character event)) | |
518 (deallocate-event event) | |
519 (null ch))) | |
520 ch)) | |
521 | |
522 (defun read-quoted-char (&optional prompt) | |
523 "Like `read-char', except that if the first character read is an octal | |
524 digit, we read up to two more octal digits and return the character | |
525 represented by the octal number consisting of those digits. | |
526 Optional argument PROMPT specifies a string to use to prompt the user." | |
527 (let ((count 0) (code 0) done | |
528 (prompt (and prompt (gettext prompt))) | |
529 char event) | |
530 (while (and (not done) (< count 3)) | |
531 (let ((inhibit-quit (zerop count)) | |
532 ;; Don't let C-h get the help message--only help function keys. | |
533 (help-char nil) | |
534 (help-form | |
535 "Type the special character you want to use, | |
536 or three octal digits representing its character code.")) | |
537 (and prompt (display-message 'prompt (format "%s-" prompt))) | |
538 (setq event (next-command-event) | |
539 char (or (event-to-character event nil nil t) | |
540 (signal 'error | |
541 (list "key read cannot be inserted in a buffer" | |
542 event)))) | |
543 (if inhibit-quit (setq quit-flag nil))) | |
544 (cond ((<= ?0 char ?7) | |
545 (setq code (+ (* code 8) (- char ?0)) | |
546 count (1+ count)) | |
547 (when prompt | |
548 (display-message 'prompt | |
549 (setq prompt (format "%s %c" prompt char))))) | |
550 ((> count 0) | |
551 (setq unread-command-event event | |
552 done t)) | |
553 (t (setq code (char-int char) | |
554 done t)))) | |
555 (int-char code) | |
556 ;; Turn a meta-character into a character with the 0200 bit set. | |
557 ; (logior (if (/= (logand code ?\M-\^@) 0) 128 0) | |
558 ; (logand 255 code)))) | |
559 )) | |
560 | |
561 (defun momentary-string-display (string pos &optional exit-char message) | |
562 "Momentarily display STRING in the buffer at POS. | |
563 Display remains until next character is typed. | |
564 If the char is EXIT-CHAR (optional third arg, default is SPC) it is swallowed; | |
565 otherwise it is then available as input (as a command if nothing else). | |
566 Display MESSAGE (optional fourth arg) in the echo area. | |
567 If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there." | |
568 (or exit-char (setq exit-char ?\ )) | |
569 (let ((buffer-read-only nil) | |
570 ;; Don't modify the undo list at all. | |
571 (buffer-undo-list t) | |
572 (modified (buffer-modified-p)) | |
573 (name buffer-file-name) | |
574 insert-end) | |
575 (unwind-protect | |
576 (progn | |
577 (save-excursion | |
578 (goto-char pos) | |
579 ;; defeat file locking... don't try this at home, kids! | |
580 (setq buffer-file-name nil) | |
581 (insert-before-markers (gettext string)) | |
582 (setq insert-end (point)) | |
583 ;; If the message end is off frame, recenter now. | |
584 (if (> (window-end) insert-end) | |
585 (recenter (/ (window-height) 2))) | |
586 ;; If that pushed message start off the frame, | |
587 ;; scroll to start it at the top of the frame. | |
588 (move-to-window-line 0) | |
589 (if (> (point) pos) | |
590 (progn | |
591 (goto-char pos) | |
592 (recenter 0)))) | |
593 (message (or message (gettext "Type %s to continue editing.")) | |
594 (single-key-description exit-char)) | |
595 (let ((event (save-excursion (next-command-event)))) | |
596 (or (eq (event-to-character event) exit-char) | |
597 (setq unread-command-event event)))) | |
598 (if insert-end | |
599 (save-excursion | |
600 (delete-region pos insert-end))) | |
601 (setq buffer-file-name name) | |
602 (set-buffer-modified-p modified)))) | |
603 | |
604 ;;; cmdloop.el ends here |