Mercurial > hg > xemacs-beta
annotate src/indent.c @ 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 | 804517e16990 |
| children | fffe735e63ee |
| rev | line source |
|---|---|
| 428 | 1 /* Indentation functions. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 | |
| 826 | 4 Free Software Foundation, Inc. |
| 793 | 5 Copyright (C) 2002 Ben Wing. |
| 428 | 6 |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* This file has been Mule-ized. */ | |
| 25 | |
| 26 /* Synched up with: 19.30. Diverges significantly from FSF. */ | |
| 27 | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 | |
| 32 #include "buffer.h" | |
| 33 #include "device.h" | |
| 34 #include "extents.h" | |
| 35 #include "faces.h" | |
| 36 #include "frame.h" | |
| 37 #include "glyphs.h" | |
| 38 #include "insdel.h" | |
| 39 #ifdef REGION_CACHE_NEEDS_WORK | |
| 40 #include "region-cache.h" | |
| 41 #endif | |
| 42 #include "window.h" | |
| 43 | |
| 44 Lisp_Object Qcoerce; | |
| 45 | |
| 46 /* Indentation can insert tabs if this is non-zero; | |
| 47 otherwise always uses spaces */ | |
| 48 int indent_tabs_mode; | |
| 49 | |
| 50 /* Avoid recalculation by remembering things in these variables. */ | |
| 51 | |
| 52 /* Last value returned by current_column. | |
| 53 | |
| 54 Some things set last_known_column_point to -1 | |
| 55 to mark the memoized value as invalid */ | |
| 56 static int last_known_column; | |
| 57 | |
| 58 /* Last buffer searched by current_column */ | |
| 59 static struct buffer *last_known_column_buffer; | |
| 60 | |
| 61 /* Value of point when current_column was called */ | |
| 665 | 62 static Charbpos last_known_column_point; |
| 428 | 63 |
| 64 /* Value of MODIFF when current_column was called */ | |
| 65 static int last_known_column_modified; | |
| 66 | |
| 665 | 67 static Charbpos |
| 68 last_visible_position (Charbpos pos, struct buffer *buf) | |
| 428 | 69 { |
| 70 Lisp_Object buffer; | |
| 71 Lisp_Object value; | |
| 72 | |
| 793 | 73 buffer = wrap_buffer (buf); |
| 428 | 74 value = Fprevious_single_property_change (make_int (pos), Qinvisible, |
| 75 buffer, Qnil); | |
| 76 if (NILP (value)) | |
| 77 return 0; /* no visible position found */ | |
| 78 else | |
| 79 /* #### bug bug bug!!! This will return the position of the beginning | |
| 80 of an invisible extent; this extent is very likely to be start-closed, | |
| 81 and thus the spaces inserted in `indent-to' will go inside the | |
| 82 invisible extent. | |
| 83 | |
| 84 Not sure what the correct solution is here. Rethink indent-to? */ | |
| 85 return XINT (value); | |
| 86 } | |
| 87 | |
| 88 #ifdef REGION_CACHE_NEEDS_WORK | |
| 89 | |
| 90 /* Allocate or free the width run cache, as requested by the current | |
| 91 state of current_buffer's cache_long_line_scans variable. */ | |
| 92 static void | |
| 93 width_run_cache_on_off (struct buffer *buf) | |
| 94 { | |
| 95 if (NILP (buf->cache_long_line_scans)) | |
| 96 { | |
| 97 /* It should be off. */ | |
| 98 if (buf->width_run_cache) | |
| 99 { | |
| 100 free_region_cache (buf->width_run_cache); | |
| 101 buf->width_run_cache = 0; | |
| 102 buf->width_table = Qnil; | |
| 103 } | |
| 104 } | |
| 105 else | |
| 106 { | |
| 107 /* It should be on. */ | |
| 108 if (buf->width_run_cache == 0) | |
| 109 { | |
| 110 buf->width_run_cache = new_region_cache (); | |
| 111 recompute_width_table (buf, buffer_display_table ()); | |
| 112 } | |
| 113 } | |
| 114 } | |
| 115 | |
| 116 #endif /* REGION_CACHE_NEEDS_WORK */ | |
| 117 | |
| 118 | |
| 119 /* Cancel any recorded value of the horizontal position. */ | |
| 120 | |
| 121 void | |
| 122 invalidate_current_column (void) | |
| 123 { | |
| 124 last_known_column_point = -1; | |
| 125 } | |
| 126 | |
| 127 int | |
| 665 | 128 column_at_point (struct buffer *buf, Charbpos init_pos, int cur_col) |
| 428 | 129 { |
| 130 int col; | |
| 131 int tab_seen; | |
| 132 int tab_width = XINT (buf->tab_width); | |
| 133 int post_tab; | |
| 665 | 134 Charbpos pos = init_pos; |
| 867 | 135 Ichar c; |
| 428 | 136 |
| 137 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; | |
| 138 col = tab_seen = post_tab = 0; | |
| 139 | |
| 140 while (1) | |
| 141 { | |
| 142 if (pos <= BUF_BEGV (buf)) | |
| 143 break; | |
| 144 | |
| 145 pos--; | |
| 146 c = BUF_FETCH_CHAR (buf, pos); | |
| 147 if (c == '\t') | |
| 148 { | |
| 149 if (tab_seen) | |
| 150 col = ((col + tab_width) / tab_width) * tab_width; | |
| 151 | |
| 152 post_tab += col; | |
| 153 col = 0; | |
| 154 tab_seen = 1; | |
| 155 } | |
| 156 else if (c == '\n' || | |
| 157 (EQ (buf->selective_display, Qt) && c == '\r')) | |
| 158 break; | |
| 159 else | |
| 160 { | |
| 161 /* #### This needs updating to handle the new redisplay. */ | |
| 162 /* #### FSFmacs looks at ctl_arrow, display tables. | |
| 163 We need to do similar. */ | |
| 164 #if 0 | |
| 665 | 165 displayed_glyphs = glyphs_from_charbpos (sel_frame, buf, |
| 428 | 166 XWINDOW (selected_window), |
| 167 pos, dp, 0, col, 0, 0, 0); | |
| 168 col += (displayed_glyphs->columns | |
| 169 - (displayed_glyphs->begin_columns | |
| 170 + displayed_glyphs->end_columns)); | |
| 171 #else /* XEmacs */ | |
| 172 #ifdef MULE | |
| 867 | 173 col += XCHARSET_COLUMNS (ichar_charset (c)); |
| 428 | 174 #else |
| 175 col ++; | |
| 176 #endif /* MULE */ | |
| 177 #endif /* XEmacs */ | |
| 178 } | |
| 179 } | |
| 180 | |
| 181 if (tab_seen) | |
| 182 { | |
| 183 col = ((col + tab_width) / tab_width) * tab_width; | |
| 184 col += post_tab; | |
| 185 } | |
| 186 | |
| 187 if (cur_col) | |
| 188 { | |
| 189 last_known_column_buffer = buf; | |
| 190 last_known_column = col; | |
| 191 last_known_column_point = init_pos; | |
| 192 last_known_column_modified = BUF_MODIFF (buf); | |
| 193 } | |
| 194 | |
| 195 return col; | |
| 196 } | |
| 197 | |
| 198 int | |
| 793 | 199 string_column_at_point (Lisp_Object s, Charbpos init_pos, int tab_width) |
| 428 | 200 { |
| 201 int col; | |
| 202 int tab_seen; | |
| 203 int post_tab; | |
| 665 | 204 Charbpos pos = init_pos; |
| 867 | 205 Ichar c; |
| 428 | 206 |
| 207 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; | |
| 208 col = tab_seen = post_tab = 0; | |
| 209 | |
| 210 while (1) | |
| 211 { | |
| 212 if (pos <= 0) | |
| 213 break; | |
| 214 | |
| 215 pos--; | |
| 867 | 216 c = string_ichar (s, pos); |
| 428 | 217 if (c == '\t') |
| 218 { | |
| 219 if (tab_seen) | |
| 220 col = ((col + tab_width) / tab_width) * tab_width; | |
| 221 | |
| 222 post_tab += col; | |
| 223 col = 0; | |
| 224 tab_seen = 1; | |
| 225 } | |
| 226 else if (c == '\n') | |
| 227 break; | |
| 228 else | |
| 229 #ifdef MULE | |
| 867 | 230 col += XCHARSET_COLUMNS (ichar_charset (c)); |
| 428 | 231 #else |
| 232 col ++; | |
| 233 #endif /* MULE */ | |
| 234 } | |
| 235 | |
| 236 if (tab_seen) | |
| 237 { | |
| 238 col = ((col + tab_width) / tab_width) * tab_width; | |
| 239 col += post_tab; | |
| 240 } | |
| 241 | |
| 242 return col; | |
| 243 } | |
| 244 | |
| 245 int | |
| 246 current_column (struct buffer *buf) | |
| 247 { | |
| 248 if (buf == last_known_column_buffer | |
| 249 && BUF_PT (buf) == last_known_column_point | |
| 250 && BUF_MODIFF (buf) == last_known_column_modified) | |
| 251 return last_known_column; | |
| 252 | |
| 253 return column_at_point (buf, BUF_PT (buf), 1); | |
| 254 } | |
| 255 | |
| 256 DEFUN ("current-column", Fcurrent_column, 0, 1, 0, /* | |
| 257 Return the horizontal position of point. Beginning of line is column 0. | |
| 258 This is calculated by adding together the widths of all the displayed | |
| 259 representations of the character between the start of the previous line | |
| 260 and point. (e.g. control characters will have a width of 2 or 4, tabs | |
| 261 will have a variable width.) | |
| 262 Ignores finite width of frame, which means that this function may return | |
| 263 values greater than (frame-width). | |
| 264 Whether the line is visible (if `selective-display' is t) has no effect; | |
| 265 however, ^M is treated as end of line when `selective-display' is t. | |
| 266 If BUFFER is nil, the current buffer is assumed. | |
| 267 */ | |
| 268 (buffer)) | |
| 269 { | |
| 270 return make_int (current_column (decode_buffer (buffer, 0))); | |
| 271 } | |
| 272 | |
| 273 | |
| 274 DEFUN ("indent-to", Findent_to, 1, 3, "NIndent to column: ", /* | |
| 275 Indent from point with tabs and spaces until COLUMN is reached. | |
| 444 | 276 Optional second argument MINIMUM says always do at least MINIMUM spaces |
| 277 even if that goes past COLUMN; by default, MINIMUM is zero. | |
| 428 | 278 If BUFFER is nil, the current buffer is assumed. |
| 279 */ | |
| 444 | 280 (column, minimum, buffer)) |
| 428 | 281 { |
| 282 /* This function can GC */ | |
| 283 int mincol; | |
| 284 int fromcol; | |
| 285 struct buffer *buf = decode_buffer (buffer, 0); | |
| 286 int tab_width = XINT (buf->tab_width); | |
| 665 | 287 Charbpos opoint = 0; |
| 428 | 288 |
| 444 | 289 CHECK_INT (column); |
| 428 | 290 if (NILP (minimum)) |
| 291 minimum = Qzero; | |
| 292 else | |
| 293 CHECK_INT (minimum); | |
| 294 | |
| 793 | 295 buffer = wrap_buffer (buf); |
| 428 | 296 |
| 297 fromcol = current_column (buf); | |
| 298 mincol = fromcol + XINT (minimum); | |
| 444 | 299 if (mincol < XINT (column)) mincol = XINT (column); |
| 428 | 300 |
| 301 if (fromcol == mincol) | |
| 302 return make_int (mincol); | |
| 303 | |
| 304 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; | |
| 305 | |
| 306 if (!NILP (Fextent_at (make_int (BUF_PT (buf)), buffer, Qinvisible, | |
| 307 Qnil, Qnil))) | |
| 308 { | |
| 665 | 309 Charbpos last_visible = last_visible_position (BUF_PT (buf), buf); |
| 428 | 310 |
| 311 opoint = BUF_PT (buf); | |
| 312 if (last_visible >= BUF_BEGV (buf)) | |
| 313 BUF_SET_PT (buf, last_visible); | |
| 314 else | |
| 563 | 315 invalid_operation ("Visible portion of buffer not modifiable", Qunbound); |
| 428 | 316 } |
| 317 | |
| 318 if (indent_tabs_mode) | |
| 319 { | |
| 320 int n = mincol / tab_width - fromcol / tab_width; | |
| 321 if (n != 0) | |
| 322 { | |
| 323 Finsert_char (make_char ('\t'), make_int (n), Qnil, buffer); | |
| 324 | |
| 325 fromcol = (mincol / tab_width) * tab_width; | |
| 326 } | |
| 327 } | |
| 328 | |
| 329 Finsert_char (make_char (' '), make_int (mincol - fromcol), Qnil, buffer); | |
| 330 | |
| 331 last_known_column_buffer = buf; | |
| 332 last_known_column = mincol; | |
| 333 last_known_column_point = BUF_PT (buf); | |
| 334 last_known_column_modified = BUF_MODIFF (buf); | |
| 335 | |
| 336 /* Not in FSF: */ | |
| 337 if (opoint > 0) | |
| 338 BUF_SET_PT (buf, opoint); | |
| 339 | |
| 340 return make_int (mincol); | |
| 341 } | |
| 342 | |
| 343 int | |
| 826 | 344 byte_spaces_at_point (struct buffer *b, Bytebpos byte_pos) |
| 428 | 345 { |
| 826 | 346 Bytebpos byte_end = BYTE_BUF_ZV (b); |
| 428 | 347 int col = 0; |
| 867 | 348 Ichar c; |
| 428 | 349 int tab_width = XINT (b->tab_width); |
| 350 | |
| 351 if (tab_width <= 0 || tab_width > 1000) | |
| 352 tab_width = 8; | |
| 353 | |
| 826 | 354 while (byte_pos < byte_end && |
| 355 (c = BYTE_BUF_FETCH_CHAR (b, byte_pos), | |
| 428 | 356 (c == '\t' |
| 357 ? (col += tab_width - col % tab_width) | |
| 358 : (c == ' ' ? ++col : 0)))) | |
| 826 | 359 INC_BYTEBPOS (b, byte_pos); |
| 428 | 360 |
| 361 return col; | |
| 362 } | |
| 363 | |
| 364 | |
| 365 DEFUN ("current-indentation", Fcurrent_indentation, 0, 1, 0, /* | |
| 366 Return the indentation of the current line. | |
| 367 This is the horizontal position of the character | |
| 368 following any initial whitespace. | |
| 369 */ | |
| 370 (buffer)) | |
| 371 { | |
| 372 struct buffer *buf = decode_buffer (buffer, 0); | |
| 665 | 373 Charbpos pos = find_next_newline (buf, BUF_PT (buf), -1); |
| 428 | 374 |
| 793 | 375 buffer = wrap_buffer (buf); |
| 428 | 376 |
| 377 if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil))) | |
| 378 return Qzero; | |
| 379 | |
| 826 | 380 return make_int (byte_spaces_at_point (buf, charbpos_to_bytebpos (buf, pos))); |
| 428 | 381 } |
| 382 | |
| 383 | |
| 384 DEFUN ("move-to-column", Fmove_to_column, 1, 3, 0, /* | |
| 385 Move point to column COLUMN in the current line. | |
| 386 The column of a character is calculated by adding together the widths | |
| 387 as displayed of the previous characters in the line. | |
| 388 This function ignores line-continuation; | |
| 389 there is no upper limit on the column number a character can have | |
| 390 and horizontal scrolling has no effect. | |
| 391 | |
| 392 If specified column is within a character, point goes after that character. | |
| 393 If it's past end of line, point goes to end of line. | |
| 394 | |
| 395 A value of 'coerce for the second (optional) argument FORCE means if | |
| 396 COLUMN is in the middle of a tab character, change it to spaces. | |
| 397 Any other non-nil value means the same, plus if the line is too short to | |
| 398 reach column COLUMN, then add spaces/tabs to get there. | |
| 399 | |
| 400 Returns the actual column that it moved to. | |
| 401 */ | |
| 402 (column, force, buffer)) | |
| 403 { | |
| 404 /* This function can GC */ | |
| 665 | 405 Charbpos pos; |
| 428 | 406 struct buffer *buf = decode_buffer (buffer, 0); |
| 407 int col = current_column (buf); | |
| 408 int goal; | |
| 665 | 409 Charbpos end; |
| 428 | 410 int tab_width = XINT (buf->tab_width); |
| 411 | |
| 412 int prev_col = 0; | |
| 867 | 413 Ichar c = 0; |
| 428 | 414 |
| 793 | 415 buffer = wrap_buffer (buf); |
| 428 | 416 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 417 CHECK_NATNUM (column); | |
| 418 goal = XINT (column); | |
| 419 | |
| 420 retry: | |
| 421 pos = BUF_PT (buf); | |
| 422 end = BUF_ZV (buf); | |
| 423 | |
| 424 /* If we're starting past the desired column, | |
| 425 back up to beginning of line and scan from there. */ | |
| 426 if (col > goal) | |
| 427 { | |
| 428 pos = find_next_newline (buf, pos, -1); | |
| 429 col = 0; | |
| 430 } | |
| 431 | |
| 432 while (col < goal && pos < end) | |
| 433 { | |
| 434 c = BUF_FETCH_CHAR (buf, pos); | |
| 435 if (c == '\n') | |
| 436 break; | |
| 437 if (c == '\r' && EQ (buf->selective_display, Qt)) | |
| 438 break; | |
| 439 if (c == '\t') | |
| 440 { | |
| 441 prev_col = col; | |
| 442 col += tab_width; | |
| 443 col = col / tab_width * tab_width; | |
| 444 } | |
| 445 else | |
| 446 { | |
| 447 /* #### oh for the days of the complete new redisplay */ | |
| 448 /* #### FSFmacs looks at ctl_arrow, display tables. | |
| 449 We need to do similar. */ | |
| 450 #if 0 | |
| 665 | 451 displayed_glyphs = glyphs_from_charbpos (selected_frame (), |
| 428 | 452 buf, |
| 453 XWINDOW (Fselected_window (Qnil)), | |
| 454 pos, dp, 0, col, 0, 0, 0); | |
| 455 col += (displayed_glyphs->columns | |
| 456 - (displayed_glyphs->begin_columns | |
| 457 + displayed_glyphs->end_columns)); | |
| 458 #else /* XEmacs */ | |
| 459 #ifdef MULE | |
| 867 | 460 col += XCHARSET_COLUMNS (ichar_charset (c)); |
| 428 | 461 #else |
| 462 col ++; | |
| 463 #endif /* MULE */ | |
| 464 #endif /* XEmacs */ | |
| 465 } | |
| 466 | |
| 467 pos++; | |
| 468 } | |
| 469 | |
| 470 BUF_SET_PT (buf, pos); | |
| 471 | |
| 472 /* If a tab char made us overshoot, change it to spaces | |
| 473 and scan through it again. */ | |
| 474 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal) | |
| 475 { | |
| 476 buffer_delete_range (buf, BUF_PT (buf) - 1, BUF_PT (buf), 0); | |
| 477 Findent_to (make_int (col - 1), Qzero, buffer); | |
| 478 buffer_insert_emacs_char (buf, ' '); | |
| 479 goto retry; | |
| 480 } | |
| 481 | |
| 482 /* If line ends prematurely, add space to the end. */ | |
| 483 if (col < goal && !NILP (force) && !EQ (force, Qcoerce)) | |
| 484 { | |
| 485 col = goal; | |
| 486 Findent_to (make_int (col), Qzero, buffer); | |
| 487 } | |
| 488 | |
| 489 last_known_column_buffer = buf; | |
| 490 last_known_column = col; | |
| 491 last_known_column_point = BUF_PT (buf); | |
| 492 last_known_column_modified = BUF_MODIFF (buf); | |
| 493 | |
| 494 return make_int (col); | |
| 495 } | |
| 496 | |
| 497 #if 0 /* #### OK boys, this function needs to be present, I think. | |
| 498 It was there before the 19.12 redisplay rewrite. */ | |
| 499 | |
| 826 | 500 DEFUN ("compute-motion", Fcompute_motion, 7, 7, 0, /* |
| 428 | 501 "Scan through the current buffer, calculating screen position. |
| 502 Scan the current buffer forward from offset FROM, | |
| 503 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)-- | |
| 504 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)-- | |
| 505 and return the ending buffer position and screen location. | |
| 506 | |
| 507 There are three additional arguments: | |
| 508 | |
| 509 WIDTH is the number of columns available to display text; | |
| 510 this affects handling of continuation lines. | |
| 511 This is usually the value returned by `window-width', less one (to allow | |
| 512 for the continuation glyph). | |
| 513 | |
| 514 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET). | |
| 515 HSCROLL is the number of columns not being displayed at the left | |
| 516 margin; this is usually taken from a window's hscroll member. | |
| 517 TAB-OFFSET is the number of columns of the first tab that aren't | |
| 518 being displayed, perhaps because the line was continued within it. | |
| 519 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero. | |
| 520 | |
| 521 WINDOW is the window to operate on. Currently this is used only to | |
| 522 find the display table. It does not matter what buffer WINDOW displays; | |
| 523 `compute-motion' always operates on the current buffer. | |
| 524 | |
| 525 The value is a list of five elements: | |
| 526 (POS HPOS VPOS PREVHPOS CONTIN) | |
| 527 POS is the buffer position where the scan stopped. | |
| 528 VPOS is the vertical position where the scan stopped. | |
| 529 HPOS is the horizontal position where the scan stopped. | |
| 530 | |
| 531 PREVHPOS is the horizontal position one character back from POS. | |
| 532 CONTIN is t if a line was continued after (or within) the previous character. | |
| 533 | |
| 534 For example, to find the buffer position of column COL of line LINE | |
| 535 of a certain window, pass the window's starting location as FROM | |
| 536 and the window's upper-left coordinates as FROMPOS. | |
| 537 Pass the buffer's (point-max) as TO, to limit the scan to the end of the | |
| 538 visible section of the buffer, and pass LINE and COL as TOPOS. | |
| 539 */ | |
| 540 (from, frompos, to, topos, width, offsets, window)) | |
| 541 { | |
| 665 | 542 Lisp_Object charbpos, hpos, vpos, prevhpos, contin; |
| 428 | 543 struct position *pos; |
| 544 int hscroll, tab_offset; | |
| 545 struct window *w = decode_window (window); | |
| 546 | |
| 547 CHECK_INT_COERCE_MARKER (from); | |
| 548 CHECK_CONS (frompos); | |
| 549 CHECK_INT (XCAR (frompos)); | |
| 550 CHECK_INT (XCDR (frompos)); | |
| 551 CHECK_INT_COERCE_MARKER (to); | |
| 552 CHECK_CONS (topos); | |
| 553 CHECK_INT (XCAR (topos)); | |
| 554 CHECK_INT (XCDR (topos)); | |
| 555 CHECK_INT (width); | |
| 556 if (!NILP (offsets)) | |
| 557 { | |
| 558 CHECK_CONS (offsets); | |
| 559 CHECK_INT (XCAR (offsets)); | |
| 560 CHECK_INT (XCDR (offsets)); | |
| 561 hscroll = XINT (XCAR (offsets)); | |
| 562 tab_offset = XINT (XCDR (offsets)); | |
| 563 } | |
| 564 else | |
| 565 hscroll = tab_offset = 0; | |
| 566 | |
| 567 pos = compute_motion (XINT (from), XINT (XCDR (frompos)), | |
| 568 XINT (XCAR (frompos)), | |
| 569 XINT (to), XINT (XCDR (topos)), | |
| 570 XINT (XCAR (topos)), | |
| 571 XINT (width), hscroll, tab_offset, w); | |
| 572 | |
| 793 | 573 charbpos = make_int (pos->charbpos); |
| 574 hpos = make_int (pos->hpos); | |
| 575 vpos = make_int (pos->vpos); | |
| 576 prevhpos = make_int (pos->prevhpos); | |
| 428 | 577 |
| 665 | 578 return list5 (charbpos, hpos, vpos, prevhpos, |
| 428 | 579 pos->contin ? Qt : Qnil); |
| 580 } | |
| 581 | |
| 582 #endif /* 0 */ | |
| 583 | |
| 584 /* Helper for vmotion_1 - compute vertical pixel motion between | |
| 585 START and END in the line start cache CACHE. This just sums | |
| 586 the line heights, including both the starting and ending lines. | |
| 587 */ | |
| 588 static int | |
| 589 vpix_motion (line_start_cache_dynarr *cache, int start, int end) | |
| 590 { | |
| 591 int i, vpix; | |
| 592 | |
| 593 assert (start <= end); | |
| 594 assert (start >= 0); | |
| 595 assert (end < Dynarr_length (cache)); | |
| 596 | |
| 597 vpix = 0; | |
| 598 for (i = start; i <= end; i++) | |
| 599 vpix += Dynarr_atp (cache, i)->height; | |
| 600 | |
| 601 return vpix; | |
| 602 } | |
| 603 | |
| 604 /***************************************************************************** | |
| 605 vmotion_1 | |
| 606 | |
| 607 Given a starting position ORIG, move point VTARGET lines in WINDOW. | |
| 608 Returns the new value for point. If the arg ret_vpos is not nil, it is | |
| 609 taken to be a pointer to an int and the number of lines actually moved is | |
| 610 returned in it. If the arg ret_vpix is not nil, it is taken to be a | |
| 611 pointer to an int and the vertical pixel height of the motion which | |
| 612 took place is returned in it. | |
| 613 ****************************************************************************/ | |
| 665 | 614 static Charbpos |
| 615 vmotion_1 (struct window *w, Charbpos orig, int vtarget, | |
| 428 | 616 int *ret_vpos, int *ret_vpix) |
| 617 { | |
| 618 struct buffer *b = XBUFFER (w->buffer); | |
| 619 int elt; | |
| 620 | |
| 621 elt = point_in_line_start_cache (w, orig, (vtarget < 0 | |
| 622 ? -vtarget | |
| 623 : vtarget)); | |
| 624 | |
| 625 /* #### This assertion must be true before the if statements are hit | |
| 626 but may possibly be wrong after the call to | |
| 627 point_in_line_start_cache if orig is outside of the visible | |
| 628 region of the buffer. Handle this. */ | |
| 629 assert (elt >= 0); | |
| 630 | |
| 631 /* Moving downward. */ | |
| 632 if (vtarget > 0) | |
| 633 { | |
| 634 int cur_line = Dynarr_length (w->line_start_cache) - 1 - elt; | |
| 665 | 635 Charbpos ret_pt; |
| 428 | 636 |
| 637 if (cur_line > vtarget) | |
| 638 cur_line = vtarget; | |
| 639 | |
| 640 /* The traditional FSF behavior is to return the end of buffer | |
| 641 position if we couldn't move far enough because we hit it. */ | |
| 642 if (cur_line < vtarget) | |
| 643 ret_pt = BUF_ZV (b); | |
| 644 else | |
| 645 ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start; | |
| 646 | |
| 647 while (ret_pt > BUF_ZV (b) && cur_line > 0) | |
| 648 { | |
| 649 cur_line--; | |
| 650 ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start; | |
| 651 } | |
| 652 | |
| 653 if (ret_vpos) *ret_vpos = cur_line; | |
| 654 if (ret_vpix) | |
| 655 *ret_vpix = vpix_motion (w->line_start_cache, elt, cur_line + elt); | |
| 656 return ret_pt; | |
| 657 } | |
| 658 else if (vtarget < 0) | |
| 659 { | |
| 660 if (elt < -vtarget) | |
| 661 { | |
| 662 if (ret_vpos) *ret_vpos = -elt; | |
| 663 if (ret_vpix) | |
| 664 *ret_vpix = vpix_motion (w->line_start_cache, 0, elt); | |
| 665 /* #### This should be BUF_BEGV (b), right? */ | |
| 666 return Dynarr_atp (w->line_start_cache, 0)->start; | |
| 667 } | |
| 668 else | |
| 669 { | |
| 670 if (ret_vpos) *ret_vpos = vtarget; | |
| 671 if (ret_vpix) | |
| 672 *ret_vpix = vpix_motion (w->line_start_cache, elt + vtarget, elt); | |
| 673 return Dynarr_atp (w->line_start_cache, elt + vtarget)->start; | |
| 674 } | |
| 675 } | |
| 676 else | |
| 677 { | |
| 678 /* No vertical motion requested so we just return the position | |
| 679 of the beginning of the current line. */ | |
| 680 if (ret_vpos) *ret_vpos = 0; | |
| 681 if (ret_vpix) | |
| 682 *ret_vpix = vpix_motion (w->line_start_cache, elt, elt); | |
| 683 | |
| 684 return Dynarr_atp (w->line_start_cache, elt)->start; | |
| 685 } | |
| 686 | |
| 1204 | 687 RETURN_NOT_REACHED(0); /* shut up compiler */ |
| 428 | 688 } |
| 689 | |
| 690 /***************************************************************************** | |
| 691 vmotion | |
| 692 | |
| 693 Given a starting position ORIG, move point VTARGET lines in WINDOW. | |
| 694 Returns the new value for point. If the arg ret_vpos is not nil, it is | |
| 695 taken to be a pointer to an int and the number of lines actually moved is | |
| 696 returned in it. | |
| 697 ****************************************************************************/ | |
| 665 | 698 Charbpos |
| 699 vmotion (struct window *w, Charbpos orig, int vtarget, int *ret_vpos) | |
| 428 | 700 { |
| 701 return vmotion_1 (w, orig, vtarget, ret_vpos, NULL); | |
| 702 } | |
| 703 | |
| 704 /* Helper for Fvertical_motion. | |
| 705 */ | |
| 706 static | |
| 707 Lisp_Object vertical_motion_1 (Lisp_Object lines, Lisp_Object window, | |
| 708 int pixels) | |
| 709 { | |
| 665 | 710 Charbpos charbpos; |
| 711 Charbpos orig; | |
| 428 | 712 int selected; |
| 713 int *vpos, *vpix; | |
| 714 int value=0; | |
| 715 struct window *w; | |
| 716 | |
| 717 if (NILP (window)) | |
| 718 window = Fselected_window (Qnil); | |
| 719 | |
| 720 CHECK_LIVE_WINDOW (window); | |
| 721 CHECK_INT (lines); | |
| 722 | |
| 723 selected = (EQ (window, Fselected_window (Qnil))); | |
| 724 | |
| 725 w = XWINDOW (window); | |
| 726 | |
| 727 orig = selected ? BUF_PT (XBUFFER (w->buffer)) | |
| 728 : marker_position (w->pointm[CURRENT_DISP]); | |
| 729 | |
| 730 vpos = pixels ? NULL : &value; | |
| 731 vpix = pixels ? &value : NULL; | |
| 732 | |
| 665 | 733 charbpos = vmotion_1 (w, orig, XINT (lines), vpos, vpix); |
| 428 | 734 |
| 735 /* Note that the buffer's point is set, not the window's point. */ | |
| 736 if (selected) | |
| 665 | 737 BUF_SET_PT (XBUFFER (w->buffer), charbpos); |
| 428 | 738 else |
| 739 set_marker_restricted (w->pointm[CURRENT_DISP], | |
| 665 | 740 make_int(charbpos), |
| 428 | 741 w->buffer); |
| 742 | |
| 743 return make_int (value); | |
| 744 } | |
| 745 | |
| 746 DEFUN ("vertical-motion", Fvertical_motion, 1, 3, 0, /* | |
| 747 Move to start of frame line LINES lines down. | |
| 748 If LINES is negative, this is moving up. | |
| 749 Optional second argument is WINDOW to move in, | |
| 750 the default is the selected window. | |
| 751 | |
| 752 Sets point to position found; this may be start of line | |
| 753 or just the start of a continuation line. | |
| 754 If optional third argument PIXELS is nil, returns number | |
| 755 of lines moved; may be closer to zero than LINES if beginning | |
| 756 or end of buffer was reached. If PIXELS is non-nil, the | |
| 757 vertical pixel height of the motion which took place is | |
| 758 returned instead of the actual number of lines moved. A | |
| 759 motion of zero lines returns the height of the current line. | |
| 760 | |
| 761 Note that `vertical-motion' sets WINDOW's buffer's point, not | |
| 762 WINDOW's point. (This differs from FSF Emacs, which buggily always | |
| 763 sets current buffer's point, regardless of WINDOW.) | |
| 764 */ | |
| 765 (lines, window, pixels)) | |
| 766 { | |
| 767 return vertical_motion_1 (lines, window, !NILP (pixels)); | |
| 768 } | |
| 769 | |
| 770 /* | |
| 771 * Like vmotion() but requested and returned movement is in pixels. | |
| 772 * HOW specifies the stopping condition. Positive means move at least | |
| 773 * PIXELS. Negative means at most. Zero means as close as possible. | |
| 774 */ | |
| 665 | 775 Charbpos |
| 776 vmotion_pixels (Lisp_Object window, Charbpos start, int pixels, int how, | |
| 428 | 777 int *motion) |
| 778 { | |
| 779 struct window *w; | |
| 665 | 780 Charbpos eobuf, bobuf; |
| 428 | 781 int defheight; |
| 782 int needed; | |
| 783 int line, next; | |
| 784 int remain, abspix, dirn; | |
| 785 int elt, nelt; | |
| 786 int i; | |
| 787 line_start_cache_dynarr *cache; | |
| 788 int previous = -1; | |
| 789 int lines; | |
| 790 | |
| 791 if (NILP (window)) | |
| 792 window = Fselected_window (Qnil); | |
| 793 | |
| 794 CHECK_LIVE_WINDOW (window); | |
| 795 w = XWINDOW (window); | |
| 796 | |
| 797 eobuf = BUF_ZV (XBUFFER (w->buffer)); | |
| 798 bobuf = BUF_BEGV (XBUFFER (w->buffer)); | |
| 799 | |
| 800 default_face_height_and_width (window, &defheight, NULL); | |
| 801 | |
| 802 /* guess num lines needed in line start cache + a few extra */ | |
| 803 abspix = abs (pixels); | |
| 804 needed = (abspix + defheight-1)/defheight + 3; | |
| 805 | |
| 806 dirn = (pixels >= 0) ? 1 : -1; | |
| 807 | |
| 808 while (1) | |
| 809 { | |
| 810 elt = point_in_line_start_cache (w, start, needed); | |
| 811 assert (elt >= 0); /* in the cache */ | |
| 812 | |
| 813 cache = w->line_start_cache; | |
| 814 nelt = Dynarr_length (cache); | |
| 815 | |
| 816 *motion = 0; | |
| 817 | |
| 818 if (pixels == 0) | |
| 819 /* No vertical motion requested so we just return the position | |
| 820 of the beginning of the current display line. */ | |
| 821 return Dynarr_atp (cache, elt)->start; | |
| 822 | |
| 823 if ((dirn < 0 && elt == 0 && | |
| 824 Dynarr_atp (cache, elt)->start <= bobuf) || | |
| 825 (dirn > 0 && elt == nelt-1 && | |
| 826 Dynarr_atp (cache, elt)->end >= eobuf)) | |
| 827 return Dynarr_atp (cache, elt)->start; | |
| 828 | |
| 829 remain = abspix; | |
| 830 for (i = elt; (dirn > 0) ? (i < nelt) : (i > 0); i += dirn) | |
| 831 { | |
| 832 /* cache line we're considering moving over */ | |
| 833 int ii = (dirn > 0) ? i : i-1; | |
| 834 | |
| 835 if (remain < 0) | |
| 836 return Dynarr_atp (cache, i)->start; | |
| 837 | |
| 838 line = Dynarr_atp (cache, ii)->height; | |
| 839 next = remain - line; | |
| 840 | |
| 841 /* is stopping condition satisfied? */ | |
| 842 if ((how > 0 && remain <= 0) || /* at least */ | |
| 843 (how < 0 && next < 0) || /* at most */ | |
| 844 (how == 0 && remain <= abs (next))) /* closest */ | |
| 845 return Dynarr_atp (cache, i)->start; | |
| 846 | |
| 847 /* moving down and nowhere left to go? */ | |
| 848 if (dirn > 0 && Dynarr_atp (cache, ii)->end >= eobuf) | |
| 849 return Dynarr_atp (cache, ii)->start; | |
| 850 | |
| 851 /* take the step */ | |
| 852 remain = next; | |
| 853 *motion += dirn * line; | |
| 854 | |
| 855 /* moving up and nowhere left to go? */ | |
| 856 if (dirn < 0 && Dynarr_atp (cache, ii)->start <= bobuf) | |
| 857 return Dynarr_atp (cache, ii)->start; | |
| 858 } | |
| 859 | |
| 860 /* get here => need more cache lines. try again. */ | |
| 861 assert (abs (*motion) > previous); /* progress? */ | |
| 862 previous = abs (*motion); | |
| 863 | |
| 864 lines = (pixels < 0) ? elt : (nelt - elt); | |
| 865 needed += (remain*lines + abspix-1)/abspix + 3; | |
| 866 } | |
| 867 | |
| 1204 | 868 RETURN_NOT_REACHED(0); /* shut up compiler */ |
| 428 | 869 } |
| 870 | |
| 871 DEFUN ("vertical-motion-pixels", Fvertical_motion_pixels, 1, 3, 0, /* | |
| 872 Move to start of frame line PIXELS vertical pixels down. | |
| 873 If PIXELS is negative, this is moving up. | |
| 874 The actual vertical motion in pixels is returned. | |
| 875 | |
| 876 Optional second argument is WINDOW to move in, | |
| 877 the default is the selected window. | |
| 878 | |
| 879 Optional third argument HOW specifies when to stop. A value | |
| 880 less than zero indicates that the motion should be no more | |
| 881 than PIXELS. A value greater than zero indicates that the | |
| 882 motion should be at least PIXELS. Any other value indicates | |
| 883 that the motion should be as close as possible to PIXELS. | |
| 884 */ | |
| 885 (pixels, window, how)) | |
| 886 { | |
| 665 | 887 Charbpos charbpos; |
| 888 Charbpos orig; | |
| 428 | 889 int selected; |
| 890 int motion; | |
| 891 int howto; | |
| 892 struct window *w; | |
| 893 | |
| 894 if (NILP (window)) | |
| 895 window = Fselected_window (Qnil); | |
| 896 | |
| 897 CHECK_LIVE_WINDOW (window); | |
| 898 CHECK_INT (pixels); | |
| 899 | |
| 900 selected = (EQ (window, Fselected_window (Qnil))); | |
| 901 | |
| 902 w = XWINDOW (window); | |
| 903 | |
| 904 orig = selected ? BUF_PT (XBUFFER (w->buffer)) | |
| 905 : marker_position (w->pointm[CURRENT_DISP]); | |
| 906 | |
| 907 howto = INTP (how) ? XINT (how) : 0; | |
| 908 | |
| 665 | 909 charbpos = vmotion_pixels (window, orig, XINT (pixels), howto, &motion); |
| 428 | 910 |
| 911 if (selected) | |
| 665 | 912 BUF_SET_PT (XBUFFER (w->buffer), charbpos); |
| 428 | 913 else |
| 914 set_marker_restricted (w->pointm[CURRENT_DISP], | |
| 665 | 915 make_int(charbpos), |
| 428 | 916 w->buffer); |
| 917 | |
| 918 return make_int (motion); | |
| 919 } | |
| 920 | |
| 921 | |
| 922 void | |
| 923 syms_of_indent (void) | |
| 924 { | |
| 925 DEFSUBR (Fcurrent_indentation); | |
| 926 DEFSUBR (Findent_to); | |
| 927 DEFSUBR (Fcurrent_column); | |
| 928 DEFSUBR (Fmove_to_column); | |
| 929 #if 0 /* #### */ | |
| 930 DEFSUBR (Fcompute_motion); | |
| 931 #endif | |
| 932 DEFSUBR (Fvertical_motion); | |
| 933 DEFSUBR (Fvertical_motion_pixels); | |
| 934 | |
| 563 | 935 DEFSYMBOL (Qcoerce); |
| 428 | 936 } |
| 937 | |
| 938 void | |
| 939 vars_of_indent (void) | |
| 940 { | |
| 941 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode /* | |
| 942 *Indentation can insert tabs if this is non-nil. | |
| 943 Setting this variable automatically makes it local to the current buffer. | |
| 944 */ ); | |
| 945 indent_tabs_mode = 1; | |
| 946 } |