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

Eliding an unneeded variable, and not skipping the end of the function 

when things went wrong.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5441 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-11-25 09:49:27 +00:00
parent 1b69dd629a
commit b255b01b50
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,6 +5,8 @@
every keystroke in a burst, but just once.
* src/text.c (do_undo): Warn about a condition that should never
occur, instead of silently continuing.
* src/text.c (do_undo): Elide an unneeded variable, and don't skip
the end of this function when things went wrong.
2015-11-24 Benno Schulenberg <bensberg@justemail.net>
* doc/syntax/makefile.nanorc: Also recognize the extensions .make and

11
src/text.c
View File

@ -563,18 +563,17 @@ void do_undo(void)
f = fsfromline(u->lineno);
break;
case ENTER:
undidmsg = _("line break");
filestruct *snipit = f->next;
if (snipit == NULL) {
if (f->next == NULL) {
statusbar(_("Internal error: line is missing. Please save your work."));
return;
break;
}
undidmsg = _("line break");
f->data = charealloc(f->data, strlen(f->data) +
strlen(&f->next->data[u->mark_begin_x]) + 1);
strcat(f->data, &f->next->data[u->mark_begin_x]);
if (openfile->filebot == snipit)
if (openfile->filebot == f->next)
openfile->filebot = f;
unlink_node(snipit);
unlink_node(f->next);
goto_line_posx(u->lineno, u->begin);
break;
case INSERT: