X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8c757fd783f2e89b47255d85aea6aa785e6045a8..8030369ccb5c871d3ce11b96c220f318bc741ed8:/src/undo.c diff --git a/src/undo.c b/src/undo.c index 40cebbac6e..edb07147a0 100644 --- a/src/undo.c +++ b/src/undo.c @@ -36,19 +36,15 @@ Lisp_Object Qinhibit_read_only; an undo-boundary. */ Lisp_Object pending_boundary; -/* Record an insertion that just happened or is about to happen, - for LENGTH characters at position BEG. - (It is possible to record an insertion before or after the fact - because we don't need to record the contents.) */ +/* Record point as it was at beginning of this command (if necessary) + And prepare the undo info for recording a change. + PT is the position of point that will naturally occur as a result of the + undo record that will be added just after this command terminates. */ -void -record_insert (beg, length) - int beg, length; +static void +record_point (pt) { - Lisp_Object lbeg, lend; - - if (EQ (current_buffer->undo_list, Qt)) - return; + int at_boundary; /* Allocate a cons cell to be the undo boundary after this command. */ if (NILP (pending_boundary)) @@ -59,9 +55,58 @@ record_insert (beg, length) Fundo_boundary (); XSETBUFFER (last_undo_buffer, current_buffer); + if (CONSP (current_buffer->undo_list)) + { + /* Set AT_BOUNDARY to 1 only when we have nothing other than + marker adjustment before undo boundary. */ + + Lisp_Object tail = current_buffer->undo_list, elt; + + while (1) + { + if (NILP (tail)) + elt = Qnil; + else + elt = XCAR (tail); + if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt)))) + break; + tail = XCDR (tail); + } + at_boundary = NILP (elt); + } + else + at_boundary = 1; + if (MODIFF <= SAVE_MODIFF) record_first_change (); + /* If we are just after an undo boundary, and + point wasn't at start of deleted range, record where it was. */ + if (at_boundary + && last_point_position != pt + /* If we're called from batch mode, this could be nil. */ + && BUFFERP (last_point_position_buffer) + && current_buffer == XBUFFER (last_point_position_buffer)) + current_buffer->undo_list + = Fcons (make_number (last_point_position), current_buffer->undo_list); +} + +/* Record an insertion that just happened or is about to happen, + for LENGTH characters at position BEG. + (It is possible to record an insertion before or after the fact + because we don't need to record the contents.) */ + +void +record_insert (beg, length) + int beg, length; +{ + Lisp_Object lbeg, lend; + + if (EQ (current_buffer->undo_list, Qt)) + return; + + record_point (beg); + /* If this is following another insertion and consecutive with it in the buffer, combine the two. */ if (CONSP (current_buffer->undo_list)) @@ -73,7 +118,7 @@ record_insert (beg, length) && INTEGERP (XCDR (elt)) && XINT (XCDR (elt)) == beg) { - XSETINT (XCDR (elt), beg + length); + XSETCDR (elt, make_number (beg + length)); return; } } @@ -93,59 +138,20 @@ record_delete (beg, string) Lisp_Object string; { Lisp_Object sbeg; - int at_boundary; if (EQ (current_buffer->undo_list, Qt)) return; - /* Allocate a cons cell to be the undo boundary after this command. */ - if (NILP (pending_boundary)) - pending_boundary = Fcons (Qnil, Qnil); - - if (BUFFERP (last_undo_buffer) - && current_buffer != XBUFFER (last_undo_buffer)) - Fundo_boundary (); - XSETBUFFER (last_undo_buffer, current_buffer); - - if (CONSP (current_buffer->undo_list)) + if (PT == beg + SCHARS (string)) { - /* Set AT_BOUNDARY to 1 only when we have nothing other than - marker adjustment before undo boundary. */ - - Lisp_Object tail = current_buffer->undo_list, elt; - - while (1) - { - if (NILP (tail)) - elt = Qnil; - else - elt = XCAR (tail); - if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt)))) - break; - tail = XCDR (tail); - } - at_boundary = NILP (elt); + XSETINT (sbeg, -beg); + record_point (PT); } else - at_boundary = 0; - - if (MODIFF <= SAVE_MODIFF) - record_first_change (); - - if (PT == beg + XSTRING (string)->size) - XSETINT (sbeg, -beg); - else - XSETFASTINT (sbeg, beg); - - /* If we are just after an undo boundary, and - point wasn't at start of deleted range, record where it was. */ - if (at_boundary - && last_point_position != XFASTINT (sbeg) - /* If we're called from batch mode, this could be nil. */ - && BUFFERP (last_point_position_buffer) - && current_buffer == XBUFFER (last_point_position_buffer)) - current_buffer->undo_list - = Fcons (make_number (last_point_position), current_buffer->undo_list); + { + XSETFASTINT (sbeg, beg); + record_point (beg); + } current_buffer->undo_list = Fcons (Fcons (string, sbeg), current_buffer->undo_list); @@ -257,10 +263,10 @@ record_property_change (beg, length, prop, value, buffer) } DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, - "Mark a boundary between units of undo.\n\ -An undo command will stop at this point,\n\ -but another undo command will undo to the previous boundary.") - () + doc: /* Mark a boundary between units of undo. +An undo command will stop at this point, +but another undo command will undo to the previous boundary. */) + () { Lisp_Object tem; if (EQ (current_buffer->undo_list, Qt)) @@ -273,7 +279,7 @@ but another undo command will undo to the previous boundary.") { /* If we have preallocated the cons cell to use here, use that one. */ - XCDR (pending_boundary) = current_buffer->undo_list; + XSETCDR (pending_boundary, current_buffer->undo_list); current_buffer->undo_list = pending_boundary; pending_boundary = Qnil; } @@ -328,7 +334,7 @@ truncate_undo_list (list, minsize, maxsize) size_so_far += sizeof (struct Lisp_Cons); if (STRINGP (XCAR (elt))) size_so_far += (sizeof (struct Lisp_String) - 1 - + XSTRING (XCAR (elt))->size); + + SCHARS (XCAR (elt))); } /* Advance to next element. */ @@ -363,7 +369,7 @@ truncate_undo_list (list, minsize, maxsize) size_so_far += sizeof (struct Lisp_Cons); if (STRINGP (XCAR (elt))) size_so_far += (sizeof (struct Lisp_String) - 1 - + XSTRING (XCAR (elt))->size); + + SCHARS (XCAR (elt))); } /* Advance to next element. */ @@ -378,7 +384,7 @@ truncate_undo_list (list, minsize, maxsize) /* Truncate at the boundary where we decided to truncate. */ if (!NILP (last_boundary)) { - XCDR (last_boundary) = Qnil; + XSETCDR (last_boundary, Qnil); return list; } else @@ -386,14 +392,14 @@ truncate_undo_list (list, minsize, maxsize) } DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0, - "Undo N records from the front of the list LIST.\n\ -Return what remains of the list.") - (n, list) + doc: /* Undo N records from the front of the list LIST. +Return what remains of the list. */) + (n, list) Lisp_Object n, list; { struct gcpro gcpro1, gcpro2; Lisp_Object next; - int count = BINDING_STACK_SIZE (); + int count = SPECPDL_INDEX (); register int arg; #if 0 /* This is a good feature, but would make undo-start @@ -407,13 +413,14 @@ Return what remains of the list.") list = Fcdr (list); #endif - CHECK_NUMBER (n, 0); + CHECK_NUMBER (n); arg = XINT (n); next = Qnil; GCPRO2 (next, list); - /* Don't let read-only properties interfere with undo. */ - if (!NILP (current_buffer->read_only)) + /* In a writable buffer, enable undoing read-only text that is so + because of text properties. */ + if (NILP (current_buffer->read_only)) specbind (Qinhibit_read_only, Qt); /* Don't let `intangible' properties interfere with undo. */ @@ -421,10 +428,10 @@ Return what remains of the list.") while (arg > 0) { - while (1) + while (CONSP (list)) { - next = Fcar (list); - list = Fcdr (list); + next = XCAR (list); + list = XCDR (list); /* Exit inner loop at undo boundary. */ if (NILP (next)) break; @@ -435,8 +442,8 @@ Return what remains of the list.") { Lisp_Object car, cdr; - car = Fcar (next); - cdr = Fcdr (next); + car = XCAR (next); + cdr = XCDR (next); if (EQ (car, Qt)) { /* Element (t high . low) records previous modtime. */ @@ -478,7 +485,6 @@ Return what remains of the list.") else if (INTEGERP (car) && INTEGERP (cdr)) { /* Element (BEG . END) means range was inserted. */ - Lisp_Object end; if (XINT (car) < BEGV || XINT (cdr) > ZV)