Mercurial > hg > xemacs-beta
annotate lisp/lisp.el @ 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 | 4bbda1c11a7b |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; lisp.el --- Lisp editing commands for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1985, 1986, 1994, 1997 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: FSF | |
| 6 ;; Keywords: lisp, languages, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 23 ;; 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: Emacs/Mule zeta. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is dumped with XEmacs. | |
| 30 | |
| 31 ;; Lisp editing commands to go with Lisp major mode. | |
| 32 | |
| 33 ;; 06/11/1997 - Use char-(after|before) instead of | |
| 34 ;; (following|preceding)-char. -slb | |
| 35 | |
| 36 ;;; Code: | |
| 37 | |
| 38 ;; Note that this variable is used by non-lisp modes too. | |
| 39 (defcustom defun-prompt-regexp nil | |
| 40 "*Non-nil => regexp to ignore, before the character that starts a defun. | |
| 41 This is only necessary if the opening paren or brace is not in column 0. | |
| 42 See `beginning-of-defun'." | |
| 43 :type '(choice (const :tag "none" nil) | |
| 44 regexp) | |
| 45 :group 'lisp) | |
| 46 | |
| 47 (make-variable-buffer-local 'defun-prompt-regexp) | |
| 48 | |
| 49 (defcustom parens-require-spaces t | |
| 50 "Non-nil => `insert-parentheses' should insert whitespace as needed." | |
| 51 :type 'boolean | |
| 52 :group 'editing-basics | |
| 53 :group 'lisp) | |
| 54 | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
55 (defun forward-sexp (&optional count) |
| 428 | 56 "Move forward across one balanced expression (sexp). |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
57 With non-nil COUNT, do it that many times. Negative COUNT means |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
58 move backward across -COUNT balanced expressions." |
| 428 | 59 ;; XEmacs change (for zmacs regions) |
| 60 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
61 (or count (setq count 1)) |
| 428 | 62 ;; XEmacs: evil hack! The other half of the evil hack below. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
63 (if (and (> count 0) (looking-at "#s(\\|#r[uU]\\{0,1\\}\"")) |
| 3543 | 64 (goto-char (1+ (- (point) (- (match-end 0) (match-beginning 0)))))) |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
65 (goto-char (or (scan-sexps (point) count) (buffer-end count))) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
66 (when (< count 0) |
| 3543 | 67 (backward-prefix-chars) |
| 68 ;; XEmacs: evil hack! Skip back over #[sr] so that structures and raw | |
| 69 ;; strings are read properly. the current cheesified syntax tables just | |
| 70 ;; aren't up to this. | |
| 71 (let* ((diff (- (point) (point-min))) | |
| 72 (subject (buffer-substring (- (point) (min diff 3)) | |
| 73 (1+ (point)))) | |
| 74 (matched (string-match "#s(\\|#r[uU]\\{0,1\\}\"" subject))) | |
| 75 (if matched | |
| 76 (goto-char (1+ (- (point) (- (length subject) matched)))))))) | |
| 428 | 77 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
78 (defun backward-sexp (&optional count) |
| 428 | 79 "Move backward across one balanced expression (sexp). |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
80 With non-nil COUNT, do it that many times. Negative COUNT means |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
81 move forward across -COUNT balanced expressions." |
| 428 | 82 ;; XEmacs change (for zmacs regions) |
| 83 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
84 (forward-sexp (- (or count 1)))) |
| 428 | 85 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
86 (defun mark-sexp (&optional count) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
87 "Set mark COUNT sexps from point. |
| 428 | 88 The place mark goes is the same place \\[forward-sexp] would |
| 89 move to with the same argument. | |
| 90 Repeat this command to mark more sexps in the same direction." | |
| 91 (interactive "p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
92 (mark-something 'mark-sexp 'forward-sexp (or count 1))) |
| 428 | 93 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
94 (defun forward-list (&optional count) |
| 428 | 95 "Move forward across one balanced group of parentheses. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
96 With non-nil COUNT, do it that many times. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
97 Negative COUNT means move backward across -COUNT groups of parentheses." |
| 428 | 98 ;; XEmacs change |
| 99 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
100 (goto-char (or (scan-lists (point) (or count 1) 0) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
101 (buffer-end (or count 1))))) |
| 428 | 102 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
103 (defun backward-list (&optional count) |
| 428 | 104 "Move backward across one balanced group of parentheses. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
105 With non-nil COUNT, do it that many times. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
106 Negative COUNT means move forward across -COUNT groups of parentheses." |
| 428 | 107 ;; XEmacs change (for zmacs regions) |
| 108 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
109 (forward-list (- (or count 1)))) |
| 428 | 110 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
111 (defun down-list (&optional count) |
| 428 | 112 "Move forward down one level of parentheses. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
113 With non-nil COUNT, do this that many times. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
114 A negative COUNT means move backward but still go down a level." |
| 428 | 115 ;; XEmacs change (for zmacs regions) |
| 116 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
117 (or count (setq count 1)) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
118 (let ((inc (if (> count 0) 1 -1))) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
119 (while (/= count 0) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
120 (goto-char (or (scan-lists (point) inc -1) (buffer-end count))) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
121 (setq count (- count inc))))) |
| 428 | 122 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
123 (defun backward-up-list (&optional count) |
| 428 | 124 "Move backward out of one level of parentheses. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
125 With COUNT, do this that many times. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
126 A negative COUNT means move forward but still to a less deep spot." |
| 428 | 127 (interactive "_p") |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
128 (up-list (- (or count 1)))) |
| 428 | 129 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
130 (defun up-list (&optional count) |
| 428 | 131 "Move forward out of one level of parentheses. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
132 With non-nil COUNT, do this that many times. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
133 A negative COUNT means move backward but still to a less deep spot. |
| 428 | 134 In Lisp programs, an argument is required." |
| 135 ;; XEmacs change (for zmacs regions) | |
| 136 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
137 (or count (setq count 1)) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
138 (let ((inc (if (> count 0) 1 -1))) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
139 (while (/= count 0) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
140 (goto-char (or (scan-lists (point) inc 1) (buffer-end count))) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
141 (setq count (- count inc))))) |
| 428 | 142 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
143 (defun kill-sexp (&optional count) |
| 428 | 144 "Kill the sexp (balanced expression) following the cursor. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
145 With non-nil COUNT, kill that many sexps after the cursor. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
146 Negative COUNT means kill -COUNT sexps before the cursor." |
| 428 | 147 (interactive "p") |
| 148 (let ((opoint (point))) | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
149 (forward-sexp (or count 1)) |
| 428 | 150 (kill-region opoint (point)))) |
| 151 | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
152 (defun backward-kill-sexp (&optional count) |
| 428 | 153 "Kill the sexp (balanced expression) preceding the cursor. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
154 With non-nil COUNT, kill that many sexps before the cursor. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
155 Negative COUNT means kill -COUNT sexps after the cursor." |
| 428 | 156 (interactive "p") |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
157 (kill-sexp (- (or count 1)))) |
| 428 | 158 |
|
4696
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
159 |
|
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
160 ;; derived stuff from GNU Emacs |
|
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
161 (defvar beginning-of-defun-function nil |
|
4724
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
162 "If non-nil, this function will be called by `beginning-of-defun-raw'. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
163 It will be called with one argument, which is a repetition count. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
164 It provides an alternative algorithm to find the beginning of the current |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
165 defun instead of using the standard one implemented by `beginning-of-defun'. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
166 See also `defun-prompt-regexp' for minor tweaks.") |
|
4712
a46d7513a364
`beginning-of-defun-function', `end-of-defun-function'
Andreas Roehler <andreas.roehler@online.de>
parents:
4705
diff
changeset
|
167 (make-variable-buffer-local 'beginning-of-defun-function) |
|
4696
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
168 |
|
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
169 (defvar end-of-defun-function nil |
|
4724
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
170 "If non-nil, this function will be called by `end-of-defun'. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
171 It will be called with no arguments. \(Repetition is implemented in |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
172 `end-of-defun' by calling this function that many times.) |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
173 This function provides an alternative algorithm to find the end |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
174 of the current defun instead of using the standard one implemented by |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
175 `end-of-defun'. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
176 ") |
|
4712
a46d7513a364
`beginning-of-defun-function', `end-of-defun-function'
Andreas Roehler <andreas.roehler@online.de>
parents:
4705
diff
changeset
|
177 (make-variable-buffer-local 'end-of-defun-function) |
|
4696
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
178 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
179 (defun beginning-of-defun (&optional count) |
|
4724
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
180 "Move backward to the beginning of the current defun. |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
181 With COUNT, do it that many times. Negative COUNT |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
182 means move forward to -COUNTth following beginning of defun. |
| 428 | 183 Returns t unless search stops due to beginning or end of buffer. |
| 184 | |
|
4724
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
185 In the default implementation provided by `beginning-of-defun-raw', |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
186 a defun starts at a char with open-parenthesis syntax at the beginning |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
187 of a line. If `defun-prompt-regexp' is non-nil, then a string which |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
188 matches that regexp may precede the open-parenthesis. Alternatively, |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
189 if `beginning-of-defun-function' is non-nil, that function is called, |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
190 and none of the default processing is done. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
191 |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
192 If the beginning of defun function returns t, point moves to the |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
193 beginning of the line containing the beginning of defun." |
| 428 | 194 ;; XEmacs change (for zmacs regions) |
| 195 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
196 (and (beginning-of-defun-raw count) |
| 428 | 197 (progn (beginning-of-line) t))) |
| 198 | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
199 (defun beginning-of-defun-raw (&optional count) |
| 428 | 200 "Move point to the character that starts a defun. |
| 201 This is identical to beginning-of-defun, except that point does not move | |
| 202 to the beginning of the line when `defun-prompt-regexp' is non-nil." | |
| 203 (interactive "p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
204 (unless count (setq count 1)) |
|
4705
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
205 (if beginning-of-defun-function |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
206 (funcall beginning-of-defun-function count) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
207 (and (< count 0) (not (eobp)) (forward-char 1)) |
|
4705
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
208 (and |
|
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
209 (re-search-backward (if defun-prompt-regexp |
|
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
210 (concat "^\\s(\\|" |
|
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
211 "\\(" defun-prompt-regexp "\\)\\s(") |
|
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
212 "^\\s(") |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
213 nil 'move count) |
|
4705
7b90173970ad
Unbreak `beginning-of-defun'.
Mike Sperber <sperber@deinprogramm.de>
parents:
4696
diff
changeset
|
214 (progn (goto-char (1- (match-end 0)))) t))) |
| 428 | 215 |
| 216 ;; XEmacs change (optional buffer parameter) | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
217 (defun buffer-end (direction &optional buffer) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
218 "Return `point-max' of BUFFER if DIRECTION > 0, else return `point-min'. |
| 428 | 219 BUFFER defaults to the current buffer if omitted." |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
220 (if (> direction 0) (point-max buffer) (point-min buffer))) |
| 428 | 221 |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
222 (defun end-of-defun (&optional count) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
223 "Move forward to next end of defun. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
224 Non-nil COUNT means do it that many times (default is 1). |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
225 Negative COUNT means move back to -COUNTth preceding end of defun. |
| 428 | 226 |
|
4724
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
227 In the default implementation, the end of a defun is the end of the |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
228 s-expression started at the character identified by `beginning-of-defun'. |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
229 |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
230 If `end-of-defun-function' is non-nil, none of the default processing is |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
231 done. For a repetition count greater than 1, `end-of-defun-function' is |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
232 called that many times. If the repetition count is less than 1, nothing |
|
7eef89a3d41f
Improve docstrings of defun movement functions.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4712
diff
changeset
|
233 is done. \(This is a bug.)" |
| 428 | 234 ;; XEmacs change (for zmacs regions) |
| 235 (interactive "_p") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
236 (if (or (null count) (= count 0)) (setq count 1)) |
|
4696
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
237 (if end-of-defun-function |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
238 (if (> count 0) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
239 (dotimes (i count) |
|
4696
ecc468b62551
funcall beginning-of-defun-function arg
andreas.roehler@online.de
parents:
3543
diff
changeset
|
240 (funcall end-of-defun-function))) |
| 428 | 241 (let ((first t)) |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
242 (while (and (> count 0) (< (point) (point-max))) |
| 428 | 243 (let ((pos (point))) ; XEmacs -- remove unused npos. |
| 244 (while (progn | |
| 245 (if (and first | |
| 246 (progn | |
| 247 (end-of-line 1) | |
| 248 (beginning-of-defun-raw 1))) | |
| 249 nil | |
| 446 | 250 (or (bobp) (backward-char 1)) |
| 428 | 251 (beginning-of-defun-raw -1)) |
| 252 (setq first nil) | |
| 253 (forward-list 1) | |
| 254 (skip-chars-forward " \t") | |
| 255 (if (looking-at "\\s<\\|\n") | |
| 256 (forward-line 1)) | |
| 257 (<= (point) pos)))) | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
258 (setq count (1- count))) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
259 (while (< count 0) |
| 428 | 260 (let ((pos (point))) |
| 261 (beginning-of-defun-raw 1) | |
| 262 (forward-sexp 1) | |
| 263 (forward-line 1) | |
| 264 (if (>= (point) pos) | |
| 265 (if (beginning-of-defun-raw 2) | |
| 266 (progn | |
| 267 (forward-list 1) | |
| 268 (skip-chars-forward " \t") | |
| 269 (if (looking-at "\\s<\\|\n") | |
| 270 (forward-line 1))) | |
| 271 (goto-char (point-min))))) | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
272 (setq count (1+ count)))))) |
| 428 | 273 |
| 274 (defun mark-defun () | |
| 275 "Put mark at end of this defun, point at beginning. | |
| 276 The defun marked is the one that contains point or follows point." | |
| 277 (interactive) | |
| 278 (push-mark (point)) | |
| 279 (end-of-defun) | |
| 280 (push-mark (point) nil t) | |
| 281 (beginning-of-defun) | |
| 282 (re-search-backward "^\n" (- (point) 1) t)) | |
| 283 | |
| 284 (defun narrow-to-defun (&optional arg) | |
| 285 "Make text outside current defun invisible. | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
286 The defun visible is the one that contains point or follows point. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
287 Optional ARG is currently ignored." |
| 428 | 288 (interactive) |
| 289 (save-excursion | |
| 290 (widen) | |
| 291 (end-of-defun) | |
| 292 (let ((end (point))) | |
| 293 (beginning-of-defun) | |
| 294 (narrow-to-region (point) end)))) | |
| 295 | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
296 (defun insert-parentheses (count) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
297 "Enclose following COUNT sexps in parentheses. Leave point after open-paren. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
298 A negative COUNT encloses the preceding -COUNT sexps instead. |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
299 COUNT defaults to zero: just insert `()' and leave point between. |
| 428 | 300 If `parens-require-spaces' is non-nil, this command also inserts a space |
| 301 before and after, depending on the surrounding characters." | |
| 302 (interactive "P") | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
303 (if count (setq count (prefix-numeric-value count)) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
304 (setq count 0)) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
305 (cond ((> count 0) (skip-chars-forward " \t")) |
|
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
306 ((< count 0) (forward-sexp count) (setq count (- count)))) |
| 428 | 307 (and parens-require-spaces |
| 308 (not (bobp)) | |
| 309 (memq (char-syntax (char-before (point))) '(?w ?_ ?\) )) | |
| 310 (insert " ")) | |
| 311 (insert ?\() | |
| 312 (save-excursion | |
|
4726
4bbda1c11a7b
Improve argument names and update docstrings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4724
diff
changeset
|
313 (or (eq count 0) (forward-sexp count)) |
| 428 | 314 (insert ?\)) |
| 315 (and parens-require-spaces | |
| 316 (not (eobp)) | |
| 317 (memq (char-syntax (char-after (point))) '(?w ?_ ?\( )) | |
| 318 (insert " ")))) | |
| 319 | |
| 320 (defun move-past-close-and-reindent () | |
| 321 "Move past next `)', delete indentation before it, then indent after it." | |
| 322 (interactive) | |
| 323 (up-list 1) | |
| 446 | 324 (backward-char 1) |
| 428 | 325 (while (save-excursion ; this is my contribution |
| 326 (let ((before-paren (point))) | |
| 327 (back-to-indentation) | |
| 328 (= (point) before-paren))) | |
| 329 (delete-indentation)) | |
| 330 (forward-char 1) | |
| 331 (newline-and-indent)) | |
| 332 | |
| 333 (defun lisp-complete-symbol () | |
| 334 "Perform completion on Lisp symbol preceding point. | |
| 335 Compare that symbol against the known Lisp symbols. | |
| 336 | |
| 337 The context determines which symbols are considered. | |
| 338 If the symbol starts just after an open-parenthesis, only symbols | |
| 339 with function definitions are considered. Otherwise, all symbols with | |
| 340 function definitions, values or properties are considered." | |
| 341 (interactive) | |
| 342 (let* ((end (point)) | |
| 343 (buffer-syntax (syntax-table)) | |
| 344 (beg (unwind-protect | |
| 345 (save-excursion | |
| 346 ;; XEmacs change | |
| 347 (if emacs-lisp-mode-syntax-table | |
| 348 (set-syntax-table emacs-lisp-mode-syntax-table)) | |
| 349 (backward-sexp 1) | |
| 350 (while (eq (char-syntax (char-after (point))) ?\') | |
| 351 (forward-char 1)) | |
| 352 (point)) | |
| 353 (set-syntax-table buffer-syntax))) | |
| 354 (pattern (buffer-substring beg end)) | |
| 355 (predicate | |
| 356 (if (eq (char-after (1- beg)) ?\() | |
| 357 'fboundp | |
| 358 ;; XEmacs change | |
| 359 #'(lambda (sym) | |
| 360 (or (boundp sym) (fboundp sym) | |
| 361 (symbol-plist sym))))) | |
| 362 (completion (try-completion pattern obarray predicate))) | |
| 363 (cond ((eq completion t)) | |
| 364 ((null completion) | |
| 365 (message "Can't find completion for \"%s\"" pattern) | |
| 366 (ding)) | |
| 367 ((not (string= pattern completion)) | |
| 368 (delete-region beg end) | |
| 369 (insert completion)) | |
| 370 (t | |
| 371 (message "Making completion list...") | |
| 372 (let ((list (all-completions pattern obarray predicate)) | |
| 373 ;FSFmacs crock unnecessary in XEmacs | |
| 374 ;see minibuf.el | |
| 375 ;(completion-fixup-function | |
| 376 ; (function (lambda () (if (save-excursion | |
| 377 ; (goto-char (max (point-min) | |
| 378 ; (- (point) 4))) | |
| 379 ; (looking-at " <f>")) | |
| 380 ; (forward-char -4)))) | |
| 381 ) | |
| 382 (or (eq predicate 'fboundp) | |
| 383 (let (new) | |
| 384 (while list | |
| 385 (setq new (cons (if (fboundp (intern (car list))) | |
| 386 (list (car list) " <f>") | |
| 387 (car list)) | |
| 388 new)) | |
| 389 (setq list (cdr list))) | |
| 390 (setq list (nreverse new)))) | |
| 391 (with-output-to-temp-buffer "*Completions*" | |
| 392 (display-completion-list list))) | |
| 393 (message "Making completion list...%s" "done"))))) | |
| 394 | |
| 395 ;;; lisp.el ends here |