ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: correct a comment, rewrap a line, and drop some debugging stuff 

An add can be contiguous even when the cursor has moved around in the
meantime but has returned to the same spot before more characters are
typed.
master
Benno Schulenberg 2018-06-02 18:04:36 +02:00
parent 71f859377d
commit 44814055b5
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/text.c
View File

@ -693,10 +693,6 @@ void do_undo(void)
return; return;
} }
#ifdef DEBUG
fprintf(stderr, " >> Undoing a type %d...\n", u->type);
#endif
openfile->current_x = u->begin; openfile->current_x = u->begin;
switch (u->type) { switch (u->type) {
case ADD: case ADD:
@ -878,10 +874,6 @@ void do_redo(void)
return; return;
} }
#ifdef DEBUG
fprintf(stderr, " >> Redoing a type %d...\n", u->type);
#endif
switch (u->type) { switch (u->type) {
case ADD: case ADD:
redidmsg = _("text add"); redidmsg = _("text add");
@ -1302,20 +1294,17 @@ void add_undo(undo_type action)
undo *u = openfile->current_undo; undo *u = openfile->current_undo;
/* The thing we did previously. */ /* The thing we did previously. */
/* When doing contiguous adds or contiguous cuts -- which means: with /* When doing contiguous adds or cuts, don't add a new undo item. */
* no cursor movement in between -- don't add a new undo item. */ if (u != NULL && action == openfile->last_action && action == u->type &&
if (u && u->mark_begin_lineno == openfile->current->lineno && action == openfile->last_action && openfile->current->lineno == u->mark_begin_lineno &&
((action == ADD && u->type == ADD && u->mark_begin_x == openfile->current_x) || ((action == ADD && u->mark_begin_x == openfile->current_x) ||
(action == CUT && u->type == CUT && u->xflags < MARK_WAS_SET && keeping_cutbuffer()))) (action == CUT && u->xflags < MARK_WAS_SET &&
keeping_cutbuffer())))
return; return;
/* Blow away newer undo items if we add somewhere in the middle. */ /* Blow away newer undo items if we add somewhere in the middle. */
discard_until(u, openfile, TRUE); discard_until(u, openfile, TRUE);
#ifdef DEBUG
fprintf(stderr, " >> Adding an undo... action = %d\n", action);
#endif
/* Allocate and initialize a new undo item. */ /* Allocate and initialize a new undo item. */
u = (undo *) nmalloc(sizeof(undo)); u = (undo *) nmalloc(sizeof(undo));
u->type = action; u->type = action;
@ -1473,10 +1462,6 @@ void update_undo(undo_type action)
char *char_buf; char *char_buf;
int char_len; int char_len;
#ifdef DEBUG
fprintf(stderr, " >> Updating an undo... action = %d\n", action);
#endif
/* If the action is different or the position changed, don't update the /* If the action is different or the position changed, don't update the
* current record but add a new one instead. */ * current record but add a new one instead. */
if (action != openfile->last_action || if (action != openfile->last_action ||