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

utils: provide a failure message for all uses of 'fsfromline'

master
Benno Schulenberg 2016-05-08 10:51:40 +02:00
parent fe9cf6f399
commit 06b449b22c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/text.c
View File

@ -478,7 +478,7 @@ void redo_cut(undo *u)
void do_undo(void) void do_undo(void)
{ {
undo *u = openfile->current_undo; undo *u = openfile->current_undo;
filestruct *t = NULL; filestruct *f, *t = NULL;
char *data, *undidmsg = NULL; char *data, *undidmsg = NULL;
if (!u) { if (!u) {
@ -486,12 +486,10 @@ void do_undo(void)
return; return;
} }
filestruct *f = fsfromline(u->mark_begin_lineno); f = fsfromline(u->mark_begin_lineno);
if (!f) { if (!f)
statusbar(_("Internal error: can't match line %d. "
"Please save your work."), u->mark_begin_lineno);
return; return;
}
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, " >> Undoing a type %d...\n", u->type); fprintf(stderr, " >> Undoing a type %d...\n", u->type);
fprintf(stderr, " >> Data we're about to undo = \"%s\"\n", f->data); fprintf(stderr, " >> Data we're about to undo = \"%s\"\n", f->data);
@ -621,6 +619,7 @@ void do_undo(void)
/* Redo the last thing(s) we undid. */ /* Redo the last thing(s) we undid. */
void do_redo(void) void do_redo(void)
{ {
filestruct *f;
char *data, *redidmsg = NULL; char *data, *redidmsg = NULL;
undo *u = openfile->undotop; undo *u = openfile->undotop;
@ -638,12 +637,10 @@ void do_redo(void)
return; return;
} }
filestruct *f = fsfromline(u->type == INSERT ? 1 : u->mark_begin_lineno); f = fsfromline(u->type == INSERT ? 1 : u->mark_begin_lineno);
if (!f) { if (!f)
statusbar(_("Internal error: can't match line %d. "
"Please save your work."), u->mark_begin_lineno);
return; return;
}
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, " >> Redo running for type %d\n", u->type); fprintf(stderr, " >> Redo running for type %d\n", u->type);
fprintf(stderr, " >> Data we're about to redo = \"%s\"\n", f->data); fprintf(stderr, " >> Data we're about to redo = \"%s\"\n", f->data);

5
src/utils.c
View File

@ -623,8 +623,11 @@ filestruct *fsfromline(ssize_t lineno)
while (f->lineno != lineno && f->next != NULL) while (f->lineno != lineno && f->next != NULL)
f = f->next; f = f->next;
if (f->lineno != lineno) if (f->lineno != lineno) {
statusbar(_("Internal error: can't match line %d. "
"Please save your work."), lineno);
return NULL; return NULL;
}
return f; return f;
} }