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

2008-08-21 Chris Allegretta <chrisa@asty.org> 

* text.c: Change error messages where we may possibly get into a bad state and urge
          the user to save when this happens.  Originally by Benno Schulenberg <bensberg@justemail.net>



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4308 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2008-08-21 04:21:06 +00:00
parent 90ad8e20b9
commit 77bf1b5197
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-08-21 Chris Allegretta <chrisa@asty.org>
* text.c: Change error messages where we may possibly get into a bad state and urge
the user to save when this happens. Originally by Benno Schulenberg <bensberg@justemail.net>
2008-08-08 Magnus Granberg <zorry@ume.nu> / Adam Conrad <?> 2008-08-08 Magnus Granberg <zorry@ume.nu> / Adam Conrad <?>
* files.c: (write_file): Add needed flags to open() calls when writing out files. Fixes Savannah bug * files.c: (write_file): Add needed flags to open() calls when writing out files. Fixes Savannah bug
#23827: Compilation fails with -D_FORTIFY_SOURCE=2 #23827: Compilation fails with -D_FORTIFY_SOURCE=2

12
src/text.c
View File

@ -386,7 +386,7 @@ void do_undo(void)
for (; f->next != NULL && f->lineno != u->lineno; f = f->next) for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
; ;
if (f->lineno != u->lineno) { if (f->lineno != u->lineno) {
statusbar(_("Couldnt match current undo line")); statusbar(_("Internal error: can't match line %d. Please save your work"), u->lineno);
return; return;
} }
#ifdef DEBUG #ifdef DEBUG
@ -484,7 +484,7 @@ void do_undo(void)
f->data = data; f->data = data;
break; break;
default: default:
undidmsg = _("wtf?"); undidmsg = _("Internal error: unknown type. Please save your work");
break; break;
} }
@ -509,7 +509,7 @@ void do_redo(void)
return; return;
} }
if (u->next != openfile->current_undo) { if (u->next != openfile->current_undo) {
statusbar(_("Can't find previous undo to re-do, argh")); statusbar(_("Internal error: Redo setup failed. Please save your work"));
return; return;
} }
@ -520,7 +520,7 @@ void do_redo(void)
for (; f->next != NULL && f->lineno != u->lineno; f = f->next) for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
; ;
if (f->lineno != u->lineno) { if (f->lineno != u->lineno) {
statusbar(_("Couldnt match current undo line")); statusbar(_("Internal error: can't match line %d. Please save your work"), u->lineno);
return; return;
} }
#ifdef DEBUG #ifdef DEBUG
@ -630,7 +630,7 @@ void do_redo(void)
cutbottom = oldcutbottom; cutbottom = oldcutbottom;
break; break;
default: default:
undidmsg = _("wtf?"); undidmsg = _("Internal error: unknown type. Please save your work");
break; break;
} }
@ -879,7 +879,7 @@ void add_undo(undo_type current_action)
case UNCUT: case UNCUT:
break; break;
case OTHER: case OTHER:
statusbar(_("OOPS. Tried to add unknown thing to undo struct, I'd save your work")); statusbar(_("Internal error: unknown type. Please save your work."));
break; break;
} }