Mercurial > emacs
view src/insdel.c @ 4872:628cbf7e7005
(comint-after-partial-file-name-command):
Renamed from comint-after-partial-pathname-command.
(comint-match-partial-file-name, comint-after-partial-file-name):
Renamed from comint-match-partial-pathname, etc.
(comint-last-output-start): New variable to record
where most recent process output started from.
(comint-mode): Initialise it.
(comint-output-filter): Set it.
(comint-previous-matching-input-string): Moved to
comint-previous-matching-input-position.
(comint-previous-matching-input-string): Use it.
(comint-search-arg, comint-search-start,
comint-previous-input-string): New subroutines.
(comint-previous-input, comint-next-input,
comint-previous-matching-input, comint-next-matching-input,
comint-previous-matching-input-from-input,
comint-next-matching-input-from-input): Use them.
(comint-mode-map): Added signal menu-bar. Moved
comint-backward/forward-matching-input to output menu-bar, since
they move within the buffer rather than do input.
(comint-send-input, comint-after-pmark-p,
comint-kill-input, comint-proc-query): Removed serialisation of
obtaining the process mark's marker-position.
Commented out comint-load-hooks.
(comint-dynamic-simple-complete): New subroutine.
(comint-dynamic-complete-filename-command): New variable.
(comint-after-partial-pathname-command): New variable.
(comint-after-partial-pathname): New subroutine.
(comint-dynamic-complete): Use them.
(comint-mode): Make them local.
Renamed comint-dynamic-complete-command to
comint-dynamic-complete-command-command for consistency.
Renamed comint-file-name-addsuffix/autolist/recexact to
comint-completion-addsuffix/autolist/recexact for consistency.
(comint-replace-by-expanded-history): Check if input
ring size is not big enough for relative reference.
(comint-read-input-ring, comint-input-ring-file-name):
From shell.el.
(shell-write-input-ring): New subroutine.
(comint-file-name-prefix): New variable.
(comint-directory): New inline subroutine.
(comint-dynamic-complete-filename, comint-dynamic-complete-variable,
comint-dynamic-list-filename-completions): Use it.
(comint-dynamic-complete-filename,
comint-dynamic-complete-variable,
comint-dynamic-list-filename-completions): Make sure local
completion-ignore-case is nil.
(comint-next-prompt, comint-previous-prompt): Use
paragraph-start and paragraph motion commands rather than
re-search-forward and re-search-backward commands.
(comint-dynamic-list-input-ring,
comint-previous-matching-input-string): Use ring-empty-p rather
than zerop and ring-length.
(comint-input-ignoredups): New variable.
(comint-send-input, shell-read-input-ring): Use it.
(comint-mode): Make comint-input-ignoredups local. Doc fix.
(comint-scroll-to-bottom-on-input): New variable.
(comint-scroll-to-bottom-on-output): New variable.
(comint-scroll-show-maximum-output): New variable.
(comint-output-filter-hook): New variable, defaults to
comint-postoutput-scroll-to-bottom.
(comint-output-filter): Renamed from comint-filter
for consistency. Now calls comint-output-filter-hook.
(comint-preinput-scroll-to-bottom): New subroutine.
(comint-postoutput-scroll-to-bottom): New subroutine.
(comint-show-maximum-output): New command.
(comint-copy-old-input): New command.
(comint-send-input): Run comint-output-filter-hook if
necessary as a kludge to prevent messy redisplays.
(comint-mode-map): Added comint-show-maximum-output to
C-c C-e and menu-bar output, and comint-copy-old-input to C-c C-i
and menu-bar input.
(comint-mode): Make local variables
comint-scroll-to-bottom-on-input, before-change-function,
comint-scroll-to-bottom-on-output, comint-scroll-show-maximum-output,
and comint-output-filter-hook.
(comint-version): Deleted--no need for separate version.
(comint-input-ring-index): Make this a permanent local.
(comint-mode): Don't alter comint-input-ring-index or comint-input-ring
if already set meaningfully.
(comint-mode-map): Added keys M-R/S for
comint-previous/next-matching-input-from-input and to completion
menu-bar. Added comint-forward/backward-matching-input and
comint-previous/next-matching-input to completion menu-bar.
(comint-mode): Doc fix for functionality.
(comint-exec-1): Uses setenv.
(comint-update-env): Removed.
(comint-input-ring-size): Incremented to 32, as with
command history.
(comint-dynamic-list-input-ring): Check for zero
length ring. Use ring length, not ring size, when generating
list. Use buffer " *Input History*".
(comint-previous-matching-input-string): Check for zero-length ring.
Check last item in case at end of cycle and it's a match.
(comint-searching-input-ring): New subroutine.
(comint-regexp-arg): New subroutine.
(comint-previous-matching-input-from-input): New command.
(comint-next-matching-input-from-input): New command.
(comint-replace-by-expanded-history): Fix for matching
inside quotes. Fix to allow argument subrange specifiers. Fix to
identify and reject absolute input number references.
(comint-within-quotes): New subroutine.
(comint-how-many-region): New subroutine.
(comint-args): New subroutine.
(comint-delim-arg): New subroutine.
(comint-arguments): New subroutine.
(comint-delimiter-argument-list): New variable.
(comint-send-input): Inserts input arguments into ring
separated by single spaces.
(comint-filter): Checks the buffer's process to make
sure it's still there. Otherwise, set-buffer will fail.
(comint-backward-matching-input): New command.
(comint-forward-matching-input): New command.
(comint-next-prompt, comint-previous-prompt):
Error if reach beg/end of buffer.
(comint-dynamic-complete): Fix for absolute input
number references.
(comint-dynamic-complete-filename): Changed listings
function to comint-dynamic-list-filename-completions. Uses
file-directory-p rather than string-match to test for directories.
(comint-dynamic-list-completions): Changed to list the
list of completions supplied as the function argument. Use buffer
" *Completions*".
(comint-match-partial-pathname): New subroutine.
(comint-dynamic-complete-variable): New command.
(comint-dynamic-list-filename-completions): New function.
(comint-previous-input):
Don't use replace-match; just insert before deleting.
(comint-magic-space): Use self-insert command.
(comint-history-file-name): New variable.
(comint-mode): Initialize comint-input-ring before
running comint-mode-hook.
(comint-input-autoexpand): New variable.
(comint-dynamic-complete-command): New variable.
(comint-get-current-command): New variable.
(comint-read-input-ring): New function.
(comint-send-input): Handle history expansion.
(comint-input-sentinel): Doc fix.
(comint-mode-map): Added key binding for C-c C-h.
Added menu bars for completion, input and output.
(comint-dynamic-list-input-ring): New function.
(comint-previous-input-string): New subroutine.
(comint-previous-input): Use it.
(comint-previous-matching-input-string): New subroutine.
(comint-previous-matching-input): Use it.
(comint-replace-by-expanded-history): New command.
(comint-magic-space): New command.
(comint-replace-by-expanded-filename): Now replaces
expanded match for a filename, and then calls filename completion
comint-dynamic-complete-filename to do file name completion.
(comint-kill-output): Don't kill prompt.
(comint-show-output): Don't move point if it's
visible where it is, and if point is moved, put it after prompt.
(comint-dynamic-complete): Totally new definition.
(comint-dynamic-complete-filename): New name for old
function comint-dynamic-complete, completes files and lists
candidates, souped up for configurability.
(comint-dynamic-complete-variable): New command.
(comint-file-name-autolist): New variable.
(comint-file-name-addsuffix): New variable,
(comint-file-name-recexact): New variable.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 22 Oct 1993 02:57:36 +0000 |
parents | 367dc6ff392c |
children | b30763a185e9 |
line wrap: on
line source
/* Buffer insertion/deletion and gap motion for GNU Emacs. Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs 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 1, or (at your option) any later version. GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <config.h> #include "lisp.h" #include "intervals.h" #include "buffer.h" #include "window.h" #include "blockinput.h" /* Move gap to position `pos'. Note that this can quit! */ move_gap (pos) int pos; { if (pos < GPT) gap_left (pos, 0); else if (pos > GPT) gap_right (pos); } /* Move the gap to POS, which is less than the current GPT. If NEWGAP is nonzero, then don't update beg_unchanged and end_unchanged. */ gap_left (pos, newgap) register int pos; int newgap; { register unsigned char *to, *from; register int i; int new_s1; pos--; if (!newgap) { if (unchanged_modified == MODIFF) { beg_unchanged = pos; end_unchanged = Z - pos - 1; } else { if (Z - GPT < end_unchanged) end_unchanged = Z - GPT; if (pos < beg_unchanged) beg_unchanged = pos; } } i = GPT; to = GAP_END_ADDR; from = GPT_ADDR; new_s1 = GPT - BEG; /* Now copy the characters. To move the gap down, copy characters up. */ while (1) { /* I gets number of characters left to copy. */ i = new_s1 - pos; if (i == 0) break; /* If a quit is requested, stop copying now. Change POS to be where we have actually moved the gap to. */ if (QUITP) { pos = new_s1; break; } /* Move at most 32000 chars before checking again for a quit. */ if (i > 32000) i = 32000; #ifdef GAP_USE_BCOPY if (i >= 128 /* bcopy is safe if the two areas of memory do not overlap or on systems where bcopy is always safe for moving upward. */ && (BCOPY_UPWARD_SAFE || to - from >= 128)) { /* If overlap is not safe, avoid it by not moving too many characters at once. */ if (!BCOPY_UPWARD_SAFE && i > to - from) i = to - from; new_s1 -= i; from -= i, to -= i; bcopy (from, to, i); } else #endif { new_s1 -= i; while (--i >= 0) *--to = *--from; } } /* Adjust markers, and buffer data structure, to put the gap at POS. POS is where the loop above stopped, which may be what was specified or may be where a quit was detected. */ adjust_markers (pos + 1, GPT, GAP_SIZE); GPT = pos + 1; QUIT; } gap_right (pos) register int pos; { register unsigned char *to, *from; register int i; int new_s1; pos--; if (unchanged_modified == MODIFF) { beg_unchanged = pos; end_unchanged = Z - pos - 1; } else { if (Z - pos - 1 < end_unchanged) end_unchanged = Z - pos - 1; if (GPT - BEG < beg_unchanged) beg_unchanged = GPT - BEG; } i = GPT; from = GAP_END_ADDR; to = GPT_ADDR; new_s1 = GPT - 1; /* Now copy the characters. To move the gap up, copy characters down. */ while (1) { /* I gets number of characters left to copy. */ i = pos - new_s1; if (i == 0) break; /* If a quit is requested, stop copying now. Change POS to be where we have actually moved the gap to. */ if (QUITP) { pos = new_s1; break; } /* Move at most 32000 chars before checking again for a quit. */ if (i > 32000) i = 32000; #ifdef GAP_USE_BCOPY if (i >= 128 /* bcopy is safe if the two areas of memory do not overlap or on systems where bcopy is always safe for moving downward. */ && (BCOPY_DOWNWARD_SAFE || from - to >= 128)) { /* If overlap is not safe, avoid it by not moving too many characters at once. */ if (!BCOPY_DOWNWARD_SAFE && i > from - to) i = from - to; new_s1 += i; bcopy (from, to, i); from += i, to += i; } else #endif { new_s1 += i; while (--i >= 0) *to++ = *from++; } } adjust_markers (GPT + GAP_SIZE, pos + 1 + GAP_SIZE, - GAP_SIZE); GPT = pos + 1; QUIT; } /* Add `amount' to the position of every marker in the current buffer whose current position is between `from' (exclusive) and `to' (inclusive). Also, any markers past the outside of that interval, in the direction of adjustment, are first moved back to the near end of the interval and then adjusted by `amount'. */ adjust_markers (from, to, amount) register int from, to, amount; { Lisp_Object marker; register struct Lisp_Marker *m; register int mpos; marker = current_buffer->markers; while (!NILP (marker)) { m = XMARKER (marker); mpos = m->bufpos; if (amount > 0) { if (mpos > to && mpos < to + amount) mpos = to + amount; } else { if (mpos > from + amount && mpos <= from) mpos = from + amount; } if (mpos > from && mpos <= to) mpos += amount; m->bufpos = mpos; marker = m->chain; } } /* Make the gap INCREMENT characters longer. */ make_gap (increment) int increment; { unsigned char *result; Lisp_Object tem; int real_gap_loc; int old_gap_size; /* If we have to get more space, get enough to last a while. */ increment += 2000; BLOCK_INPUT; result = BUFFER_REALLOC (BEG_ADDR, (Z - BEG + GAP_SIZE + increment)); UNBLOCK_INPUT; if (result == 0) memory_full (); BEG_ADDR = result; /* Prevent quitting in move_gap. */ tem = Vinhibit_quit; Vinhibit_quit = Qt; real_gap_loc = GPT; old_gap_size = GAP_SIZE; /* Call the newly allocated space a gap at the end of the whole space. */ GPT = Z + GAP_SIZE; GAP_SIZE = increment; /* Move the new gap down to be consecutive with the end of the old one. This adjusts the markers properly too. */ gap_left (real_gap_loc + old_gap_size, 1); /* Now combine the two into one large gap. */ GAP_SIZE += old_gap_size; GPT = real_gap_loc; Vinhibit_quit = tem; } /* Insert a string of specified length before point. DO NOT use this for the contents of a Lisp string! prepare_to_modify_buffer could relocate the string. */ insert (string, length) register unsigned char *string; register length; { register Lisp_Object temp; if (length < 1) return; /* Make sure point-max won't overflow after this insertion. */ XSET (temp, Lisp_Int, length + Z); if (length + Z != XINT (temp)) error ("maximum buffer size exceeded"); prepare_to_modify_buffer (point, point); if (point != GPT) move_gap (point); if (GAP_SIZE < length) make_gap (length - GAP_SIZE); record_insert (point, length); MODIFF++; bcopy (string, GPT_ADDR, length); /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ offset_intervals (current_buffer, point, length); GAP_SIZE -= length; GPT += length; ZV += length; Z += length; SET_PT (point + length); signal_after_change (point-length, 0, length); } /* Insert the part of the text of STRING, a Lisp object assumed to be of type string, consisting of the LENGTH characters starting at position POS. If the text of STRING has properties, they are absorbed into the buffer. It does not work to use `insert' for this, because a GC could happen before we bcopy the stuff into the buffer, and relocate the string without insert noticing. */ insert_from_string (string, pos, length, inherit) Lisp_Object string; register int pos, length; int inherit; { register Lisp_Object temp; struct gcpro gcpro1; if (length < 1) return; /* Make sure point-max won't overflow after this insertion. */ XSET (temp, Lisp_Int, length + Z); if (length + Z != XINT (temp)) error ("maximum buffer size exceeded"); GCPRO1 (string); prepare_to_modify_buffer (point, point); if (point != GPT) move_gap (point); if (GAP_SIZE < length) make_gap (length - GAP_SIZE); record_insert (point, length); MODIFF++; UNGCPRO; bcopy (XSTRING (string)->data, GPT_ADDR, length); /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ offset_intervals (current_buffer, point, length); GAP_SIZE -= length; GPT += length; ZV += length; Z += length; /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ graft_intervals_into_buffer (XSTRING (string)->intervals, point, current_buffer, inherit); SET_PT (point + length); signal_after_change (point-length, 0, length); } /* Insert the character C before point */ void insert_char (c) unsigned char c; { insert (&c, 1); } /* Insert the null-terminated string S before point */ void insert_string (s) char *s; { insert (s, strlen (s)); } /* Like `insert' except that all markers pointing at the place where the insertion happens are adjusted to point after it. Don't use this function to insert part of a Lisp string, since gc could happen and relocate it. */ insert_before_markers (string, length) unsigned char *string; register int length; { register int opoint = point; insert (string, length); adjust_markers (opoint - 1, opoint, length); } /* Insert part of a Lisp string, relocating markers after. */ insert_from_string_before_markers (string, pos, length, inherit) Lisp_Object string; register int pos, length; int inherit; { register int opoint = point; insert_from_string (string, pos, length, inherit); adjust_markers (opoint - 1, opoint, length); } /* Delete characters in current buffer from FROM up to (but not including) TO. */ del_range (from, to) register int from, to; { register int numdel; /* Make args be valid */ if (from < BEGV) from = BEGV; if (to > ZV) to = ZV; if ((numdel = to - from) <= 0) return; /* Make sure the gap is somewhere in or next to what we are deleting. */ if (from > GPT) gap_right (from); if (to < GPT) gap_left (to, 0); prepare_to_modify_buffer (from, to); record_delete (from, numdel); MODIFF++; /* Relocate point as if it were a marker. */ if (from < point) { if (point < to) SET_PT (from); else SET_PT (point - numdel); } /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ offset_intervals (current_buffer, point, - numdel); /* Relocate all markers pointing into the new, larger gap to point at the end of the text before the gap. */ adjust_markers (to + GAP_SIZE, to + GAP_SIZE, - numdel - GAP_SIZE); GAP_SIZE += numdel; ZV -= numdel; Z -= numdel; GPT = from; if (GPT - BEG < beg_unchanged) beg_unchanged = GPT - BEG; if (Z - GPT < end_unchanged) end_unchanged = Z - GPT; signal_after_change (from, numdel, 0); } /* Call this if you're about to change the region of BUFFER from START to END. This checks the read-only properties of the region, calls the necessary modification hooks, and warns the next redisplay that it should pay attention to that area. */ modify_region (buffer, start, end) struct buffer *buffer; int start, end; { struct buffer *old_buffer = current_buffer; if (buffer != old_buffer) set_buffer_internal (buffer); prepare_to_modify_buffer (start, end); if (start - 1 < beg_unchanged || unchanged_modified == MODIFF) beg_unchanged = start - 1; if (Z - end < end_unchanged || unchanged_modified == MODIFF) end_unchanged = Z - end; MODIFF++; if (buffer != old_buffer) set_buffer_internal (old_buffer); } /* Check that it is okay to modify the buffer between START and END. Run the before-change-function, if any. If intervals are in use, verify that the text to be modified is not read-only, and call any modification properties the text may have. */ prepare_to_modify_buffer (start, end) Lisp_Object start, end; { if (!NILP (current_buffer->read_only)) Fbarf_if_buffer_read_only (); /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */ verify_interval_modification (current_buffer, start, end); verify_overlay_modification (start, end); #ifdef CLASH_DETECTION if (!NILP (current_buffer->filename) && current_buffer->save_modified >= MODIFF) lock_file (current_buffer->filename); #else /* At least warn if this file has changed on disk since it was visited. */ if (!NILP (current_buffer->filename) && current_buffer->save_modified >= MODIFF && NILP (Fverify_visited_file_modtime (Fcurrent_buffer ())) && !NILP (Ffile_exists_p (current_buffer->filename))) call1 (intern ("ask-user-about-supersession-threat"), current_buffer->filename); #endif /* not CLASH_DETECTION */ signal_before_change (start, end); Vdeactivate_mark = Qt; } static Lisp_Object before_change_function_restore (value) Lisp_Object value; { Vbefore_change_function = value; } static Lisp_Object after_change_function_restore (value) Lisp_Object value; { Vafter_change_function = value; } /* Signal a change to the buffer immediately before it happens. START and END are the bounds of the text to be changed, as Lisp objects. */ signal_before_change (start, end) Lisp_Object start, end; { /* If buffer is unmodified, run a special hook for that case. */ if (current_buffer->save_modified >= MODIFF && !NILP (Vfirst_change_hook) && !NILP (Vrun_hooks)) call1 (Vrun_hooks, Qfirst_change_hook); /* Now in any case run the before-change-function if any. */ if (!NILP (Vbefore_change_function)) { int count = specpdl_ptr - specpdl; Lisp_Object function; function = Vbefore_change_function; record_unwind_protect (after_change_function_restore, Vafter_change_function); record_unwind_protect (before_change_function_restore, Vbefore_change_function); Vafter_change_function = Qnil; Vbefore_change_function = Qnil; call2 (function, start, end); unbind_to (count, Qnil); } } /* Signal a change immediately after it happens. POS is the address of the start of the changed text. LENDEL is the number of characters of the text before the change. (Not the whole buffer; just the part that was changed.) LENINS is the number of characters in the changed text. */ signal_after_change (pos, lendel, lenins) int pos, lendel, lenins; { if (!NILP (Vafter_change_function)) { int count = specpdl_ptr - specpdl; Lisp_Object function; function = Vafter_change_function; record_unwind_protect (after_change_function_restore, Vafter_change_function); record_unwind_protect (before_change_function_restore, Vbefore_change_function); Vafter_change_function = Qnil; Vbefore_change_function = Qnil; call3 (function, make_number (pos), make_number (pos + lenins), make_number (lendel)); unbind_to (count, Qnil); } }