Mercurial > hg > xemacs-beta
view src/cmds.c @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* 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 (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Mar 2010 04:08:17 -0600 |
parents | 91950589598c |
children | c096d8051f89 308d34e9f07d |
line wrap: on
line source
/* Simple built-in editing commands. Copyright (C) 1985, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Mule 2.0, FSF 19.30. */ #include <config.h> #include "lisp.h" #include "commands.h" #include "buffer.h" #include "extents.h" #include "syntax.h" #include "insdel.h" Lisp_Object Qkill_forward_chars; Lisp_Object Qself_insert_command; Lisp_Object Qno_self_insert; Lisp_Object Vblink_paren_function; /* A possible value for a buffer's overwrite-mode variable. */ Lisp_Object Qoverwrite_mode_binary; /* Non-nil means put this face on the next self-inserting character. */ Lisp_Object Vself_insert_face; /* This is the command that set up Vself_insert_face. */ Lisp_Object Vself_insert_face_command; /* A char-table for characters which may invoke auto-filling. */ Lisp_Object Vauto_fill_chars; DEFUN ("forward-char", Fforward_char, 0, 2, "_p", /* Move point right COUNT characters (left if COUNT is negative). On attempt to pass end of buffer, stop and signal `end-of-buffer'. On attempt to pass beginning of buffer, stop and signal `beginning-of-buffer'. On reaching end of buffer, stop and signal error. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *buf = decode_buffer (buffer, 1); EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } /* This used to just set point to point + XINT (count), and then check to see if it was within boundaries. But now that SET_PT can potentially do a lot of stuff (calling entering and exiting hooks, etcetera), that's not a good approach. So we validate the proposed position, then set point. */ { Charbpos new_point = BUF_PT (buf) + n; if (new_point < BUF_BEGV (buf)) { BUF_SET_PT (buf, BUF_BEGV (buf)); Fsignal (Qbeginning_of_buffer, Qnil); return Qnil; } if (new_point > BUF_ZV (buf)) { BUF_SET_PT (buf, BUF_ZV (buf)); Fsignal (Qend_of_buffer, Qnil); return Qnil; } BUF_SET_PT (buf, new_point); } return Qnil; } DEFUN ("backward-char", Fbackward_char, 0, 2, "_p", /* Move point left COUNT characters (right if COUNT is negative). On attempt to pass end of buffer, stop and signal `end-of-buffer'. On attempt to pass beginning of buffer, stop and signal `beginning-of-buffer'. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { if (NILP (count)) count = make_int (-1); else { CHECK_INT (count); count = make_int (- XINT (count)); } return Fforward_char (count, buffer); } DEFUN ("forward-line", Fforward_line, 0, 2, "_p", /* Move COUNT lines forward (backward if COUNT is negative). Precisely, if point is on line I, move to the start of line I + COUNT. If there isn't room, go as far as possible (no error). Returns the count of lines left to move. If moving forward, that is COUNT - number of lines moved; if backward, COUNT + number moved. \(Note that if COUNT is negative, the return will be non-positive.) With positive COUNT, a non-empty line at the end counts as one line successfully moved (for the return value). If BUFFER is nil, the current buffer is assumed. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *buf = decode_buffer (buffer, 1); Charbpos pos2 = BUF_PT (buf); Charbpos pos; EMACS_INT n, shortage, negp; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } negp = n <= 0; pos = scan_buffer (buf, '\n', pos2, 0, n - negp, &shortage, 1); if (shortage > 0 && (negp || (BUF_ZV (buf) > BUF_BEGV (buf) && pos != pos2 && BUF_FETCH_CHAR (buf, pos - 1) != '\n'))) shortage--; BUF_SET_PT (buf, pos); return make_int (negp ? - shortage : shortage); } DEFUN ("point-at-bol", Fpoint_at_bol, 0, 2, 0, /* Return the character position of the first character on the current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, return that position. This function does not move point. */ (count, buffer)) { struct buffer *b = decode_buffer (buffer, 1); REGISTER int orig, end; buffer = wrap_buffer (b); if (NILP (count)) count = make_int (0); else { CHECK_INT (count); count = make_int (XINT (count) - 1); } orig = BUF_PT (b); Fforward_line (count, buffer); end = BUF_PT (b); BUF_SET_PT (b, orig); return make_int (end); } DEFUN ("beginning-of-line", Fbeginning_of_line, 0, 2, "_p", /* Move point to beginning of current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, stop there without error. If BUFFER is nil, the current buffer is assumed. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *b = decode_buffer (buffer, 1); BUF_SET_PT (b, XINT (Fpoint_at_bol (count, buffer))); return Qnil; } DEFUN ("point-at-eol", Fpoint_at_eol, 0, 2, 0, /* Return the character position of the last character on the current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, return that position. This function does not move point. */ (count, buffer)) { struct buffer *buf = decode_buffer (buffer, 1); EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } return make_int (find_before_next_newline (buf, BUF_PT (buf), 0, n - (n <= 0))); } DEFUN ("end-of-line", Fend_of_line, 0, 2, "_p", /* Move point to end of current line. With argument COUNT not nil or 1, move forward COUNT - 1 lines first. If scan reaches end of buffer, stop there without error. If BUFFER is nil, the current buffer is assumed. The characters that are moved over may be added to the current selection \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. */ (count, buffer)) { struct buffer *b = decode_buffer (buffer, 1); BUF_SET_PT (b, XINT (Fpoint_at_eol (count, buffer))); return Qnil; } DEFUN ("delete-char", Fdelete_char, 0, 2, "*p\nP", /* Delete the following COUNT characters (previous, with negative COUNT). Optional second arg KILLP non-nil means kill instead (save in kill ring). Interactively, COUNT is the prefix arg, and KILLP is set if COUNT was explicitly specified. */ (count, killp)) { /* This function can GC */ Charbpos pos; struct buffer *buf = current_buffer; EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } pos = BUF_PT (buf) + n; if (NILP (killp)) { if (n < 0) { if (pos < BUF_BEGV (buf)) signal_error (Qbeginning_of_buffer, 0, Qunbound); else buffer_delete_range (buf, pos, BUF_PT (buf), 0); } else { if (pos > BUF_ZV (buf)) signal_error (Qend_of_buffer, 0, Qunbound); else buffer_delete_range (buf, BUF_PT (buf), pos, 0); } } else { call1 (Qkill_forward_chars, count); } return Qnil; } DEFUN ("delete-backward-char", Fdelete_backward_char, 0, 2, "*p\nP", /* Delete the previous COUNT characters (following, with negative COUNT). Optional second arg KILLP non-nil means kill instead (save in kill ring). Interactively, COUNT is the prefix arg, and KILLP is set if COUNT was explicitly specified. */ (count, killp)) { /* This function can GC */ EMACS_INT n; if (NILP (count)) n = 1; else { CHECK_INT (count); n = XINT (count); } return Fdelete_char (make_int (- n), killp); } static void internal_self_insert (Ichar ch, int noautofill); DEFUN ("self-insert-command", Fself_insert_command, 1, 1, "*p", /* Insert the character you type. Whichever character you type to run this command is inserted. If a prefix arg COUNT is specified, the character is inserted COUNT times. */ (count)) { /* This function can GC */ Ichar ch; Lisp_Object c; EMACS_INT n; CHECK_NATNUM (count); n = XINT (count); if (CHAR_OR_CHAR_INTP (Vlast_command_char)) c = Vlast_command_char; else c = Fevent_to_character (Vlast_command_event, Qnil, Qnil, Qnil); if (NILP (c)) invalid_operation ( "Last typed key has no character equivalent (that we know of)", Fcopy_event (Vlast_command_event, Qnil)); CHECK_CHAR_COERCE_INT (c); ch = XCHAR (c); while (n--) internal_self_insert (ch, (n != 0)); return Qnil; } /* Insert character C1. If NOAUTOFILL is nonzero, don't do autofill even if it is enabled. FSF: If this insertion is suitable for direct output (completely simple), return 0. A value of 1 indicates this *might* not have been simple. A value of 2 means this did things that call for an undo boundary. */ static void internal_self_insert (Ichar c1, int noautofill) { /* This function can GC */ /* int hairy = 0; -- unused */ REGISTER enum syntaxcode synt; REGISTER Ichar c2; Lisp_Object overwrite; Lisp_Object syntax_table; struct buffer *buf = current_buffer; int tab_width; overwrite = buf->overwrite_mode; syntax_table = buf->mirror_syntax_table; #if 0 /* No, this is very bad, it makes undo *always* undo a character at a time instead of grouping consecutive self-inserts together. Nasty nasty. */ if (!NILP (Vbefore_change_functions) || !NILP (Vafter_change_functions) || !NILP (Vbefore_change_function) || !NILP (Vafter_change_function)) hairy = 1; #endif if (!NILP (overwrite) && BUF_PT (buf) < BUF_ZV (buf) && (EQ (overwrite, Qoverwrite_mode_binary) || (c1 != '\n' && BUF_FETCH_CHAR (buf, BUF_PT (buf)) != '\n')) && (EQ (overwrite, Qoverwrite_mode_binary) || BUF_FETCH_CHAR (buf, BUF_PT (buf)) != '\t' || ((tab_width = XINT (buf->tab_width), tab_width <= 0) || tab_width > 20 || !((current_column (buf) + 1) % tab_width)))) { buffer_delete_range (buf, BUF_PT (buf), BUF_PT (buf) + 1, 0); /* hairy = 2; */ } if (!NILP (buf->abbrev_mode) && !WORD_SYNTAX_P (syntax_table, c1) && NILP (buf->read_only) && BUF_PT (buf) > BUF_BEGV (buf)) { c2 = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1); if (WORD_SYNTAX_P (syntax_table, c2)) { #if 1 Fexpand_abbrev (); #else /* FSFmacs */ Lisp_Object sym = Fexpand_abbrev (); /* I think this is too bogus to add. The function should have a way of examining the character to be inserted, so it can decide whether to insert it or not. We should design it better than that. */ /* Here FSFmacs remembers MODIFF, compares it after Fexpand_abbrev() finishes, and updates HAIRY. */ /* NOTE: we cannot simply check for Vlast_abbrev, because Fexpand_abbrev() can bail out before setting it to anything meaningful, leaving us stuck with an old value. Thus Fexpand_abbrev() was extended to return the actual abbrev symbol. */ if (!NILP (sym) && !NILP (symbol_function (XSYMBOL (sym))) && SYMBOLP (symbol_function (XSYMBOL (sym)))) { Lisp_Object prop = Fget (symbol_function (XSYMBOL (sym)), Qno_self_insert, Qnil); if (!NILP (prop)) return; } #endif /* FSFmacs */ } } if ((CHAR_TABLEP (Vauto_fill_chars) ? !NILP (get_char_table (c1, Vauto_fill_chars)) : (c1 == ' ' || c1 == '\n')) && !noautofill && !NILP (buf->auto_fill_function)) { buffer_insert_emacs_char (buf, c1); if (c1 == '\n') /* After inserting a newline, move to previous line and fill */ /* that. Must have the newline in place already so filling and */ /* justification, if any, know where the end is going to be. */ BUF_SET_PT (buf, BUF_PT (buf) - 1); call0 (buf->auto_fill_function); if (c1 == '\n') BUF_SET_PT (buf, BUF_PT (buf) + 1); /* hairy = 2; */ } else buffer_insert_emacs_char (buf, c1); /* If previous command specified a face to use, use it. */ if (!NILP (Vself_insert_face) && EQ (Vlast_command, Vself_insert_face_command)) { Lisp_Object before = make_int (BUF_PT (buf) - 1); Lisp_Object after = make_int (BUF_PT (buf)); Fput_text_property (before, after, Qface, Vself_insert_face, Qnil); Fput_text_property (before, after, Qstart_open, Qt, Qnil); Fput_text_property (before, after, Qend_open, Qnil, Qnil); /* #### FSFmacs properties are normally closed ("sticky") on the end but not the beginning. It's the opposite for us. */ Vself_insert_face = Qnil; } synt = SYNTAX (syntax_table, c1); if ((synt == Sclose || synt == Smath) && !NILP (Vblink_paren_function) && INTERACTIVE && !noautofill) { call0 (Vblink_paren_function); /* hairy = 2; */ } /* return hairy; */ } /* (this comes from Mule but is a generally good idea) */ DEFUN ("self-insert-internal", Fself_insert_internal, 1, 1, 0, /* Invoke `self-insert-command' as if CHARACTER is entered from keyboard. */ (character)) { /* This function can GC */ CHECK_CHAR_COERCE_INT (character); internal_self_insert (XCHAR (character), 0); return Qnil; } /* module initialization */ void syms_of_cmds (void) { DEFSYMBOL (Qkill_forward_chars); DEFSYMBOL (Qself_insert_command); DEFSYMBOL (Qoverwrite_mode_binary); DEFSYMBOL (Qno_self_insert); DEFSUBR (Fforward_char); DEFSUBR (Fbackward_char); DEFSUBR (Fforward_line); DEFSUBR (Fbeginning_of_line); DEFSUBR (Fend_of_line); DEFSUBR (Fpoint_at_bol); DEFSUBR (Fpoint_at_eol); DEFSUBR (Fdelete_char); DEFSUBR (Fdelete_backward_char); DEFSUBR (Fself_insert_command); DEFSUBR (Fself_insert_internal); } void vars_of_cmds (void) { DEFVAR_LISP ("self-insert-face", &Vself_insert_face /* If non-nil, set the face of the next self-inserting character to this. See also `self-insert-face-command'. */ ); Vself_insert_face = Qnil; DEFVAR_LISP ("self-insert-face-command", &Vself_insert_face_command /* This is the command that set up `self-insert-face'. If `last-command' does not equal this value, we ignore `self-insert-face'. */ ); Vself_insert_face_command = Qnil; DEFVAR_LISP ("blink-paren-function", &Vblink_paren_function /* Function called, if non-nil, whenever a close parenthesis is inserted. More precisely, a char with closeparen syntax is self-inserted. */ ); Vblink_paren_function = Qnil; DEFVAR_LISP ("auto-fill-chars", &Vauto_fill_chars /* A char-table for characters which invoke auto-filling. Such characters have value t in this table. */); Vauto_fill_chars = Fmake_char_table (Qgeneric); XCHAR_TABLE (Vauto_fill_chars)->ascii[' '] = Qt; XCHAR_TABLE (Vauto_fill_chars)->ascii['\n'] = Qt; }