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

Add undo for line break via enter, separate from line wrap 

Change message for line split to line wrap, since split ~= break



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4391 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2009-04-21 05:34:08 +00:00
parent df543e78df
commit b843a51b79
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.h
View File

@ -180,7 +180,7 @@ typedef enum {
} function_type; } function_type;
typedef enum { typedef enum {
ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, INSERT, OTHER ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, ENTER, INSERT, OTHER
} undo_type; } undo_type;
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR

25
src/text.c
View File

@ -474,7 +474,7 @@ void do_undo(void)
openfile->current_x += strlen(u->strdata); openfile->current_x += strlen(u->strdata);
break; break;
case SPLIT: case SPLIT:
undidmsg = _("line split"); undidmsg = _("line wrap");
f->data = nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1); f->data = nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
strcpy(&f->data[strlen(f->data) - 1], u->strdata); strcpy(&f->data[strlen(f->data) - 1], u->strdata);
if (u->xflags & UNDO_SPLIT_MADENEW) { if (u->xflags & UNDO_SPLIT_MADENEW) {
@ -505,6 +505,16 @@ void do_undo(void)
undidmsg = _("text uncut"); undidmsg = _("text uncut");
redo_cut(u); redo_cut(u);
break; break;
case ENTER:
undidmsg = _("line break");
if (f->next) {
f->data = nrealloc(f->data, strlen(f->data) + strlen(f->next->data) + 1);
strcat(f->data, f->next->data);
filestruct *foo = f->next;
unlink_node(foo);
delete_node(foo);
}
break;
case INSERT: case INSERT:
undidmsg = _("text insert"); undidmsg = _("text insert");
cutbuffer = NULL; cutbuffer = NULL;
@ -529,11 +539,13 @@ void do_undo(void)
u->strdata = f->data; u->strdata = f->data;
f->data = data; f->data = data;
break; break;
default: default:
undidmsg = _("Internal error: unknown type. Please save your work"); undidmsg = _("Internal error: unknown type. Please save your work");
break; break;
} }
renumber(f);
do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE); do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
statusbar(_("Undid action (%s)"), undidmsg); statusbar(_("Undid action (%s)"), undidmsg);
openfile->current_undo = openfile->current_undo->next; openfile->current_undo = openfile->current_undo->next;
@ -593,8 +605,13 @@ void do_redo(void)
free(f->data); free(f->data);
f->data = data; f->data = data;
break; break;
case ENTER:
undidmsg = _("line break");
do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
do_enter();
break;
case SPLIT: case SPLIT:
undidmsg = _("line split"); undidmsg = _("line wrap");
t = make_new_node(f); t = make_new_node(f);
t->data = mallocstrcpy(NULL, &u->strdata[u->begin]); t->data = mallocstrcpy(NULL, &u->strdata[u->begin]);
data = mallocstrncpy(NULL, f->data, u->begin); data = mallocstrncpy(NULL, f->data, u->begin);
@ -662,7 +679,7 @@ void do_enter(void)
assert(openfile->current != NULL && openfile->current->data != NULL); assert(openfile->current != NULL && openfile->current->data != NULL);
#ifndef NANO_TINY #ifndef NANO_TINY
update_undo(SPLIT); update_undo(ENTER);
/* Do auto-indenting, like the neolithic Turbo Pascal editor. */ /* Do auto-indenting, like the neolithic Turbo Pascal editor. */
@ -909,6 +926,8 @@ void add_undo(undo_type current_action)
u->cutbottom = last_cutu->cutbottom; u->cutbottom = last_cutu->cutbottom;
} }
break; break;
case ENTER:
break;
case OTHER: case OTHER:
statusbar(_("Internal error: unknown type. Please save your work.")); statusbar(_("Internal error: unknown type. Please save your work."));
break; break;