Mercurial > hg > xemacs-beta
annotate lisp/process.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 | 23eaac87b4b0 |
children | 35aac3cef6af |
rev | line source |
---|---|
428 | 1 ;;; process.el --- commands for subprocesses; split out of simple.el |
2 | |
3 ;; Copyright (C) 1985-7, 1993,4, 1997 Free Software Foundation, Inc. | |
853 | 4 ;; Copyright (C) 1995, 2000, 2001, 2002 Ben Wing. |
428 | 5 |
6 ;; Author: Ben Wing | |
7 ;; Maintainer: XEmacs Development Team | |
8 ;; Keywords: internal, processes, dumped | |
9 | |
10 ;; This file is part of XEmacs. | |
11 | |
12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
13 ;; under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; XEmacs is distributed in the hope that it will be useful, but | |
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
20 ;; General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
444 | 23 ;; along with XEmacs; see the file COPYING. If not, write to the |
428 | 24 ;; Free Software Foundation, 59 Temple Place - Suite 330, |
25 ;; Boston, MA 02111-1307, USA. | |
26 | |
771 | 27 ;;; Synched up with: FSF 19.30, except for setenv/getenv (synched with FSF |
28 ;;; 21.0.105). | |
428 | 29 |
442 | 30 ;;; Authorship: |
31 | |
32 ;; Created 1995 by Ben Wing during Mule work -- some commands split out | |
33 ;; of simple.el and wrappers of *-internal functions created so they could | |
34 ;; be redefined in a Mule world. | |
35 ;; Lisp definition of call-process-internal added Mar. 2000 by Ben Wing. | |
36 | |
428 | 37 ;;; Commentary: |
38 | |
39 ;; This file is dumped with XEmacs. | |
40 | |
41 ;;; Code: | |
42 | |
43 | |
44 (defgroup processes nil | |
45 "Process, subshell, compilation, and job control support." | |
46 :group 'external | |
47 :group 'development) | |
48 | |
49 (defgroup processes-basics nil | |
50 "Basic stuff dealing with processes." | |
51 :group 'processes) | |
52 | |
53 (defgroup execute nil | |
54 "Executing external commands." | |
55 :group 'processes) | |
56 | |
611 | 57 ;; This may be changed to "/c" in win32-native.el. |
428 | 58 |
59 (defvar shell-command-switch "-c" | |
60 "Switch used to have the shell execute its command line argument.") | |
61 | |
62 (defun start-process-shell-command (name buffer &rest args) | |
63 "Start a program in a subprocess. Return the process object for it. | |
64 NAME is name for process. It is modified if necessary to make it unique. | |
65 BUFFER is the buffer or (buffer-name) to associate with the process. | |
66 Process output goes at end of that buffer, unless you specify | |
67 an output stream or filter function to handle the output. | |
68 BUFFER may be also nil, meaning that this process is not associated | |
69 with any buffer | |
70 Third arg is command name, the name of a shell command. | |
71 Remaining arguments are the arguments for the command. | |
72 Wildcards and redirection are handled as usual in the shell." | |
73 ;; We used to use `exec' to replace the shell with the command, | |
74 ;; but that failed to handle (...) and semicolon, etc. | |
75 (start-process name buffer shell-file-name shell-command-switch | |
76 (mapconcat #'identity args " "))) | |
77 | |
862 | 78 (defun process-synchronize-point (proc) |
79 "Set the point(s) in buffer and stderr-buffer according to the process mark." | |
80 ;; We need this because the documentation says to insert *BEFORE* point, | |
81 ;; but we end up inserting after because only the process mark moves | |
82 ;; forward, not point. We synchronize after every place output might | |
83 ;; happen, in sentinels, and in an unwind-protect, to make *SURE* that | |
84 ;; point is correct. (We could do this more easily and perhaps more | |
85 ;; safely using a process filter, but that would create a LOT of garbage | |
86 ;; since all the data would get sent in strings.) We make this a separate | |
87 ;; function, not an flet, due to dynamic binding problems -- the flet may | |
88 ;; not still be in scope when the sentinel is called. | |
89 (let ((pb (process-buffer proc)) | |
90 (pm (process-mark proc))) | |
91 (if (and pb (buffer-live-p pb) (marker-buffer pm)) | |
92 (goto-char pm pb)) | |
93 (if (process-has-separate-stderr-p proc) | |
94 (let ((pseb (process-stderr-buffer proc)) | |
95 (psem (process-stderr-mark proc))) | |
96 (if (and pseb (not (eq pb pseb)) | |
97 (buffer-live-p pseb) | |
98 (marker-buffer psem)) | |
99 (goto-char psem pseb)))))) | |
100 | |
853 | 101 (defun call-process-internal (program &optional infile buffer display |
102 &rest args) | |
103 "Internal function to call PROGRAM synchronously in separate process. | |
104 Lisp callers should use `call-process' or `call-process-region'. | |
105 | |
442 | 106 The program's input comes from file INFILE (nil means `/dev/null'). |
853 | 107 XEmacs feature: INFILE can also be a list of (BUFFER [START [END]]), i.e. |
108 a list of one to three elements, consisting of a buffer and optionally | |
109 a start position or start and end position. In this case, input comes | |
110 from the buffer, starting from START (defaults to the beginning of the | |
111 buffer) and ending at END (defaults to the end of the buffer). | |
112 | |
442 | 113 Insert output in BUFFER before point; t means current buffer; |
114 nil for BUFFER means discard it; 0 means discard and don't wait. | |
853 | 115 If BUFFER is a string, then find or create a buffer with that name, |
116 then insert the output in that buffer, before point. | |
442 | 117 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, |
118 REAL-BUFFER says what to do with standard output, as above, | |
119 while STDERR-FILE says what to do with standard error in the child. | |
120 STDERR-FILE may be nil (discard standard error output), | |
853 | 121 t (mix it with ordinary output), a file name string, or (XEmacs feature) |
122 a buffer object. If STDERR-FILE is a buffer object (but not the name of | |
123 a buffer, since that would be interpreted as a file), the standard error | |
124 output will be inserted into the buffer before point. | |
442 | 125 |
126 Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. | |
127 Remaining arguments are strings passed as command arguments to PROGRAM. | |
128 | |
853 | 129 If BUFFER is 0, returns immediately with value nil. |
130 Otherwise waits for PROGRAM to terminate and returns a numeric exit status | |
131 or a signal description string. If you quit, the process is first killed | |
132 with SIGINT, then with SIGKILL if you quit again before the process exits. | |
133 | |
134 Coding systems for the process are the same as for `start-process-internal'." | |
135 (let (proc inbuf errbuf kill-inbuf kill-errbuf no-wait start end) | |
136 ;; first set up an unwind-protect to clean everything up. this will: | |
137 ;; | |
138 ;; -- kill the process. (when we're not waiting for it to finish, we | |
139 ;; set PROC to nil when we're ready to exit so this doesn't happen -- | |
140 ;; if we're interrupted before we're ready to exit, we should still | |
141 ;; kill the process) | |
142 ;; -- kill temporary buffers created to handle I/O to or from a file. | |
143 ;; KILL-INBUF/KILL-ERRBUF tell us if we should do so. | |
144 ;; | |
145 ;; note that we need to be *very* careful in this code to handle C-g | |
146 ;; at any point. | |
147 (unwind-protect | |
148 (progn | |
149 ;; first handle INFILE. | |
150 (cond ((stringp infile) | |
151 (setq infile (expand-file-name infile)) | |
152 (setq kill-inbuf t) | |
153 (setq inbuf (generate-new-buffer "*call-process*")) | |
154 ;; transfer the exact contents of the file to the process. | |
155 ;; we do that by reading in and writing out in | |
156 ;; binary. #### is this even correct? should we be doing | |
157 ;; the same thing with stderr? if so we'd need a way of | |
158 ;; controlling the stderr coding system separate from | |
159 ;; everything else. | |
160 (with-current-buffer inbuf | |
161 ;; Make sure this works with jka-compr | |
162 (let ((file-name-handler-alist nil)) | |
163 (insert-file-contents-internal infile nil nil nil nil | |
164 'binary)) | |
165 (setq start (point-min) end (point-max)))) | |
166 ((consp infile) | |
167 (setq inbuf (get-buffer (car infile))) | |
168 (setq start (or (nth 1 infile) (point-min inbuf))) | |
169 (setq end (or (nth 2 infile) (point-max inbuf)))) | |
170 ((null infile) nil) | |
171 (t | |
172 (error 'wrong-type-argument | |
173 "Must be filename or (BUFFER [START [END]])" | |
174 infile))) | |
175 ;; now handle BUFFER | |
176 (let ((stderr (if (consp buffer) (second buffer) t))) | |
177 (if (consp buffer) (setq buffer (car buffer))) | |
178 (setq buffer | |
179 (cond ((null buffer) nil) | |
180 ((eq buffer t) (current-buffer)) | |
181 ;; use integerp for compatibility with existing | |
182 ;; call-process rmsism. | |
183 ((integerp buffer) (setq no-wait t) nil) | |
184 (t (get-buffer-create buffer)))) | |
185 (when (and stderr (not (eq t stderr))) | |
186 ;; both ERRBUF and STDERR being non-nil indicates to the | |
187 ;; code below that STDERR is a file and we should write | |
188 ;; ERRBUF to it; so clear out STDERR if we don't want this. | |
189 (if (bufferp stderr) (setq errbuf stderr stderr nil) | |
442 | 190 (setq stderr (expand-file-name stderr)) |
853 | 191 (setq kill-errbuf t) |
192 (setq errbuf (generate-new-buffer "*call-process*")))) | |
193 ;; now start process. using a pty causes all sorts of | |
194 ;; weirdness, at least under cygwin, when there's input. #### i | |
195 ;; don't know what's going wrong and whether it's a cygwin-only | |
196 ;; problem. suffice to say that there were NO pty connections | |
197 ;; in the old version. | |
198 (let ((process-connection-type nil)) | |
442 | 199 (setq proc |
200 (apply 'start-process-internal "*call-process*" | |
853 | 201 (if (eq t stderr) buffer (list buffer errbuf)) |
202 program args))) | |
203 ;; see comment above where the data was read from the file. | |
204 (if kill-inbuf | |
205 (set-process-output-coding-system proc 'binary)) | |
206 ;; point mark/stderr-mark at the right place (by default it's | |
207 ;; end of buffer). | |
208 (if buffer | |
209 (set-marker (process-mark proc) (point buffer) buffer)) | |
210 (if errbuf | |
211 (set-marker (process-stderr-mark proc) (point errbuf) errbuf)) | |
859 | 212 ;; now do I/O, very carefully! the unwind-protect makes sure |
213 ;; to clear out the sentinel, since it does a `throw', which | |
214 ;; would have no catch (or writes to a file -- we only want | |
215 ;; this on normal exit) | |
862 | 216 (unwind-protect |
217 ;; if not NO-WAIT, set a sentinel to return the exit | |
218 ;; status. it will throw to this catch so we can exit | |
219 ;; properly. | |
220 (catch 'call-process-done | |
221 (set-process-sentinel | |
222 proc | |
223 (cond | |
224 ((and no-wait errbuf stderr) | |
225 ;; we're trying really really hard to emulate | |
226 ;; the old call-process, which would save the | |
227 ;; stderr to a file even if discarding output. so | |
228 ;; we set a sentinel to save the output when | |
229 ;; we finish. | |
230 ;; | |
231 ;; #### not clear if we should be doing this. | |
232 ;; | |
233 ;; NOTE NOTE NOTE: Due to the total bogosity of | |
234 ;; dynamic scoping, and the lack of closures, we | |
235 ;; have to be careful how we write the first | |
236 ;; sentinel below since it may be executed after | |
237 ;; this function has returned -- thus we fake a | |
238 ;; closure. (This doesn't apply to the second one, | |
239 ;; which only gets executed within the | |
240 ;; unwind-protect.) | |
241 `(lambda (proc status) | |
242 (set-process-sentinel proc nil) | |
243 (process-synchronize-point proc) | |
244 (with-current-buffer ,errbuf | |
245 (write-region-internal | |
246 1 (1+ (buffer-size)) | |
247 ,stderr | |
248 nil 'major-rms-kludge-city nil | |
249 coding-system-for-write)) | |
250 (kill-buffer ,errbuf))) | |
251 (no-wait nil) | |
252 (t | |
253 ;; normal sentinel: maybe write out stderr and return | |
254 ;; status. | |
255 #'(lambda (proc status) | |
256 (process-synchronize-point proc) | |
257 (when (and errbuf stderr) | |
258 (with-current-buffer errbuf | |
259 (write-region-internal | |
260 1 (1+ (buffer-size)) stderr | |
261 nil 'major-rms-kludge-city nil | |
262 coding-system-for-write))) | |
263 (cond ((eq 'exit (process-status proc)) | |
264 (set-process-sentinel proc nil) | |
265 (throw 'call-process-done | |
266 (process-exit-status proc))) | |
267 ((eq 'signal (process-status proc)) | |
268 (set-process-sentinel proc nil) | |
269 (throw 'call-process-done status))))))) | |
270 (if (not no-wait) | |
271 ;; we're waiting. send the input and loop forever, | |
272 ;; handling process output and maybe redisplaying. | |
273 ;; exit happens through the sentinel or C-g. if | |
274 ;; C-g, send SIGINT the first time, EOF if not | |
275 ;; already done so (might make the process exit), | |
276 ;; and keep waiting. Another C-g will exit the | |
277 ;; whole function, and the unwind-protect will | |
278 ;; kill the process. (Hence the documented semantics | |
279 ;; of SIGINT/SIGKILL.) | |
280 (let (eof-sent) | |
281 (condition-case nil | |
282 (progn | |
283 (when inbuf | |
284 (process-send-region proc start end inbuf)) | |
285 (process-send-eof proc) | |
286 (setq eof-sent t) | |
287 (while t | |
288 (accept-process-output proc) | |
289 (process-synchronize-point proc) | |
290 (if display (sit-for 0)))) | |
291 (quit | |
292 (process-send-signal 'SIGINT proc) | |
293 (unless eof-sent | |
294 (process-send-eof proc)) | |
295 (while t | |
296 (accept-process-output proc) | |
297 (process-synchronize-point proc) | |
298 (if display (sit-for 0)))))) | |
299 ;; discard and no wait: send the input, set PROC | |
300 ;; and ERRBUF to nil so that the unwind-protect | |
301 ;; forms don't erase the sentinel, kill the process, | |
302 ;; or kill ERRBUF (the sentinel does that), and exit. | |
303 (when inbuf | |
304 (process-send-region proc start end inbuf)) | |
305 (process-send-eof proc) | |
306 (setq errbuf nil) | |
307 (setq proc nil))) | |
308 ;; inner unwind-protect, once we're ready to do I/O. | |
309 (when proc | |
310 (set-process-sentinel proc nil) | |
311 (process-synchronize-point proc))))) | |
859 | 312 ;; outer unwind-protect forms, to make sure we always clean up. |
853 | 313 (if (and inbuf kill-inbuf) (kill-buffer inbuf)) |
314 (if (and errbuf kill-errbuf) (kill-buffer errbuf)) | |
315 (condition-case nil | |
316 (if (and proc (process-live-p proc)) (kill-process proc)) | |
317 (error nil))))) | |
428 | 318 |
319 | |
320 (defun shell-command (command &optional output-buffer) | |
321 "Execute string COMMAND in inferior shell; display output, if any. | |
322 | |
323 If COMMAND ends in ampersand, execute it asynchronously. | |
324 The output appears in the buffer `*Async Shell Command*'. | |
325 That buffer is in shell mode. | |
326 | |
327 Otherwise, COMMAND is executed synchronously. The output appears in the | |
328 buffer `*Shell Command Output*'. | |
329 If the output is one line, it is displayed in the echo area *as well*, | |
330 but it is nonetheless available in buffer `*Shell Command Output*', | |
331 even though that buffer is not automatically displayed. | |
332 If there is no output, or if output is inserted in the current buffer, | |
333 then `*Shell Command Output*' is deleted. | |
334 | |
335 The optional second argument OUTPUT-BUFFER, if non-nil, | |
336 says to put the output in some other buffer. | |
337 If OUTPUT-BUFFER is a buffer or buffer name, put the output there. | |
338 If OUTPUT-BUFFER is not a buffer and not nil, | |
339 insert output in current buffer. (This cannot be done asynchronously.) | |
340 In either case, the output is inserted after point (leaving mark after it)." | |
341 (interactive (list (read-shell-command "Shell command: ") | |
342 current-prefix-arg)) | |
343 (if (and output-buffer | |
344 (not (or (bufferp output-buffer) (stringp output-buffer)))) | |
345 (progn (barf-if-buffer-read-only) | |
444 | 346 (push-mark nil (not (interactive-p))) |
428 | 347 ;; We do not use -f for csh; we will not support broken use of |
348 ;; .cshrcs. Even the BSD csh manual says to use | |
349 ;; "if ($?prompt) exit" before things which are not useful | |
350 ;; non-interactively. Besides, if someone wants their other | |
351 ;; aliases for shell commands then they can still have them. | |
352 (call-process shell-file-name nil t nil | |
353 shell-command-switch command) | |
354 (exchange-point-and-mark t)) | |
355 ;; Preserve the match data in case called from a program. | |
356 (save-match-data | |
357 (if (string-match "[ \t]*&[ \t]*$" command) | |
358 ;; Command ending with ampersand means asynchronous. | |
359 (progn | |
776 | 360 (if-fboundp 'background |
361 (background (substring command 0 | |
362 (match-beginning 0))) | |
363 (error | |
364 'unimplemented | |
365 "backgrounding a shell command requires package `background'"))) | |
366 | |
428 | 367 (shell-command-on-region (point) (point) command output-buffer))))) |
368 | |
369 ;; We have a sentinel to prevent insertion of a termination message | |
370 ;; in the buffer itself. | |
371 (defun shell-command-sentinel (process signal) | |
372 (if (memq (process-status process) '(exit signal)) | |
373 (message "%s: %s." | |
374 (car (cdr (cdr (process-command process)))) | |
375 (substring signal 0 -1)))) | |
376 | |
377 (defun shell-command-on-region (start end command | |
378 &optional output-buffer replace) | |
379 "Execute string COMMAND in inferior shell with region as input. | |
380 Normally display output (if any) in temp buffer `*Shell Command Output*'; | |
381 Prefix arg means replace the region with it. | |
382 | |
383 The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER, REPLACE. | |
384 If REPLACE is non-nil, that means insert the output | |
385 in place of text from START to END, putting point and mark around it. | |
386 | |
387 If the output is one line, it is displayed in the echo area, | |
388 but it is nonetheless available in buffer `*Shell Command Output*' | |
389 even though that buffer is not automatically displayed. | |
390 If there is no output, or if output is inserted in the current buffer, | |
391 then `*Shell Command Output*' is deleted. | |
392 | |
393 If the optional fourth argument OUTPUT-BUFFER is non-nil, | |
394 that says to put the output in some other buffer. | |
395 If OUTPUT-BUFFER is a buffer or buffer name, put the output there. | |
396 If OUTPUT-BUFFER is not a buffer and not nil, | |
397 insert output in the current buffer. | |
398 In either case, the output is inserted after point (leaving mark after it)." | |
399 (interactive (let ((string | |
400 ;; Do this before calling region-beginning | |
401 ;; and region-end, in case subprocess output | |
402 ;; relocates them while we are in the minibuffer. | |
403 (read-shell-command "Shell command on region: "))) | |
404 ;; call-interactively recognizes region-beginning and | |
405 ;; region-end specially, leaving them in the history. | |
406 (list (region-beginning) (region-end) | |
407 string | |
408 current-prefix-arg | |
409 current-prefix-arg))) | |
410 (if (or replace | |
411 (and output-buffer | |
412 (not (or (bufferp output-buffer) (stringp output-buffer))))) | |
413 ;; Replace specified region with output from command. | |
414 (let ((swap (and replace (< start end)))) | |
415 ;; Don't muck with mark unless REPLACE says we should. | |
416 (goto-char start) | |
417 (and replace (push-mark)) | |
418 (call-process-region start end shell-file-name t t nil | |
419 shell-command-switch command) | |
420 (let ((shell-buffer (get-buffer "*Shell Command Output*"))) | |
421 (and shell-buffer (not (eq shell-buffer (current-buffer))) | |
422 (kill-buffer shell-buffer))) | |
423 ;; Don't muck with mark unless REPLACE says we should. | |
424 (and replace swap (exchange-point-and-mark t))) | |
425 ;; No prefix argument: put the output in a temp buffer, | |
426 ;; replacing its entire contents. | |
427 (let ((buffer (get-buffer-create | |
428 (or output-buffer "*Shell Command Output*"))) | |
429 (success nil) | |
430 (exit-status nil) | |
431 (directory default-directory)) | |
432 (unwind-protect | |
433 (if (eq buffer (current-buffer)) | |
434 ;; If the input is the same buffer as the output, | |
435 ;; delete everything but the specified region, | |
436 ;; then replace that region with the output. | |
437 (progn (setq buffer-read-only nil) | |
438 (delete-region (max start end) (point-max)) | |
921 | 439 (delete-region (point-min) (min start end)) |
428 | 440 (setq exit-status |
441 (call-process-region (point-min) (point-max) | |
442 shell-file-name t t nil | |
443 shell-command-switch command)) | |
444 (setq success t)) | |
445 ;; Clear the output buffer, | |
446 ;; then run the command with output there. | |
447 (save-excursion | |
448 (set-buffer buffer) | |
449 (setq buffer-read-only nil) | |
450 ;; XEmacs change | |
451 (setq default-directory directory) | |
452 (erase-buffer)) | |
453 (setq exit-status | |
454 (call-process-region start end shell-file-name | |
455 nil buffer nil | |
456 shell-command-switch command)) | |
457 (setq success t)) | |
458 ;; Report the amount of output. | |
459 (let ((lines (save-excursion | |
460 (set-buffer buffer) | |
461 (if (= (buffer-size) 0) | |
462 0 | |
463 (count-lines (point-min) (point-max)))))) | |
464 (cond ((= lines 0) | |
465 (if success | |
466 (display-message | |
467 'command | |
468 (if (eql exit-status 0) | |
469 "(Shell command succeeded with no output)" | |
470 "(Shell command failed with no output)"))) | |
471 (kill-buffer buffer)) | |
472 ((and success (= lines 1)) | |
473 (message "%s" | |
474 (save-excursion | |
475 (set-buffer buffer) | |
476 (goto-char (point-min)) | |
477 (buffer-substring (point) | |
478 (progn (end-of-line) | |
479 (point)))))) | |
480 (t | |
481 (set-window-start (display-buffer buffer) 1)))))))) | |
482 | |
483 (defun shell-quote-argument (argument) | |
484 "Quote an argument for passing as argument to an inferior shell." | |
442 | 485 (if (and (eq system-type 'windows-nt) |
486 (let ((progname (downcase (file-name-nondirectory | |
487 shell-file-name)))) | |
488 (or (equal progname "command.com") | |
489 (equal progname "cmd.exe")))) | |
490 ;; the expectation is that you can take the result of | |
491 ;; shell-quote-argument and pass it to as an arg to | |
492 ;; (start-process shell-quote-argument ...) and have it end | |
493 ;; up as-is in the program's argv[] array. to do this, we | |
494 ;; need to protect against both the shell's and the program's | |
495 ;; quoting conventions (and our own conventions in | |
496 ;; mswindows-construct-process-command-line!). Putting quotes | |
497 ;; around shell metachars gets through the last two, and applying | |
498 ;; the normal VC runtime quoting works with practically all apps. | |
776 | 499 (declare-fboundp (mswindows-quote-one-vc-runtime-arg argument t)) |
611 | 500 (if (equal argument "") |
501 "\"\"" | |
502 ;; Quote everything except POSIX filename characters. | |
503 ;; This should be safe enough even for really weird shells. | |
504 (let ((result "") (start 0) end) | |
505 (while (string-match "[^-0-9a-zA-Z_./]" argument start) | |
506 (setq end (match-beginning 0) | |
507 result (concat result (substring argument start end) | |
508 "\\" (substring argument end (1+ end))) | |
509 start (1+ end))) | |
510 (concat result (substring argument start)))))) | |
428 | 511 |
438 | 512 (defun shell-command-to-string (command) |
513 "Execute shell command COMMAND and return its output as a string." | |
428 | 514 (with-output-to-string |
1189 | 515 (with-current-buffer standard-output |
516 (call-process shell-file-name nil t nil shell-command-switch command)))) | |
428 | 517 |
438 | 518 (defalias 'exec-to-string 'shell-command-to-string) |
771 | 519 |
520 | |
521 ;; History list for environment variable names. | |
522 (defvar read-envvar-name-history nil) | |
523 | |
524 (defun read-envvar-name (prompt &optional mustmatch) | |
525 "Read environment variable name, prompting with PROMPT. | |
526 Optional second arg MUSTMATCH, if non-nil, means require existing envvar name. | |
527 If it is also not t, RET does not exit if it does non-null completion." | |
528 (completing-read prompt | |
529 (mapcar (function | |
530 (lambda (enventry) | |
531 (list (substring enventry 0 | |
532 (string-match "=" enventry))))) | |
533 process-environment) | |
534 nil mustmatch nil 'read-envvar-name-history)) | |
535 | |
536 ;; History list for VALUE argument to setenv. | |
537 (defvar setenv-history nil) | |
538 | |
930 | 539 (defun substitute-env-vars (string) |
540 "Substitute environment variables referred to in STRING. | |
541 `$FOO' where FOO is an environment variable name means to substitute | |
542 the value of that variable. The variable name should be terminated | |
543 with a character not a letter, digit or underscore; otherwise, enclose | |
544 the entire variable name in braces. Use `$$' to insert a single | |
545 dollar sign." | |
546 (let ((start 0)) | |
547 (while (string-match | |
548 ;; XEmacs change - FSF use their rx macro to generate this regexp | |
549 "\\(?:\\$\\(\\(?:[a-zA-Z0-9_]\\)+\\)\\)\\|\\(?:\\${\\(\\(?:.\\|\n\\)*?\\)}\\)\\|\\$\\$" | |
550 string start) | |
551 (cond ((match-beginning 1) | |
552 (let ((value (getenv (match-string 1 string)))) | |
553 (setq string (replace-match (or value "") t t string) | |
554 start (+ (match-beginning 0) (length value))))) | |
555 ((match-beginning 2) | |
556 (let ((value (getenv (match-string 2 string)))) | |
557 (setq string (replace-match (or value "") t t string) | |
558 start (+ (match-beginning 0) (length value))))) | |
559 (t | |
560 (setq string (replace-match "$" t t string) | |
561 start (+ (match-beginning 0) 1))))) | |
562 string)) | |
563 | |
564 (defun setenv (variable &optional value unset substitute-env-vars) | |
771 | 565 "Set the value of the environment variable named VARIABLE to VALUE. |
566 VARIABLE should be a string. VALUE is optional; if not provided or is | |
567 `nil', the environment variable VARIABLE will be removed. | |
568 | |
930 | 569 UNSET, if non-nil, means to remove VARIABLE from the environment. |
570 SUBSTITUTE-ENV-VARS, if non-nil, means to substitute environment | |
571 variables in VALUE using `substitute-env-vars'. | |
572 | |
771 | 573 Interactively, a prefix argument means to unset the variable. |
574 Interactively, the current value (if any) of the variable | |
575 appears at the front of the history list when you type in the new value. | |
576 | |
577 This function works by modifying `process-environment'." | |
578 (interactive | |
579 (if current-prefix-arg | |
580 (list (read-envvar-name "Clear environment variable: " 'exact) nil t) | |
581 (let ((var (read-envvar-name "Set environment variable: " nil))) | |
582 ;; Here finally we specify the args to call setenv with. | |
583 (list var (read-from-minibuffer (format "Set %s to value: " var) | |
584 nil nil nil 'setenv-history | |
585 (getenv var)))))) | |
930 | 586 (if unset |
587 (setq value nil) | |
588 (if substitute-env-vars | |
589 (setq value (substitute-env-vars value)))) | |
771 | 590 (if (string-match "=" variable) |
591 (error "Environment variable name `%s' contains `='" variable) | |
592 (let ((pattern (concat "\\`" (regexp-quote (concat variable "=")))) | |
593 (case-fold-search nil) | |
594 (scan process-environment) | |
595 found) | |
596 (if (string-equal "TZ" variable) | |
597 (set-time-zone-rule value)) | |
598 (while scan | |
599 (cond ((string-match pattern (car scan)) | |
600 (setq found t) | |
601 (if (eq nil value) | |
602 (setq process-environment (delq (car scan) process-environment)) | |
603 (setcar scan (concat variable "=" value))) | |
604 (setq scan nil))) | |
605 (setq scan (cdr scan))) | |
606 (or found | |
607 (if value | |
608 (setq process-environment | |
609 (cons (concat variable "=" value) | |
610 process-environment))))))) | |
611 | |
612 ;; already in C. Can't move it to Lisp too easily because it's needed | |
613 ;; extremely early in the Lisp loadup sequence. | |
614 | |
615 ; (defun getenv (variable) | |
616 ; "Get the value of environment variable VARIABLE. | |
617 ; VARIABLE should be a string. Value is nil if VARIABLE is undefined in | |
618 ; the environment. Otherwise, value is a string. | |
619 ; | |
620 ; This function consults the variable `process-environment' | |
621 ; for its value." | |
622 ; (interactive (list (read-envvar-name "Get environment variable: " t))) | |
623 ; (let ((value (getenv-internal variable))) | |
624 ; (when (interactive-p) | |
625 ; (message "%s" (if value value "Not set"))) | |
626 ; value)) | |
627 | |
628 (provide 'env) ;; Yuck. Formerly the above were in env.el, which did this | |
629 ;; provide. | |
428 | 630 |
631 ;;; process.el ends here |