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

diff --git a/ChangeLog b/ChangeLog
index fe24400c052e6488a1cb89eef6cd81c7802ee7bf..6bab4bef87afe88253e743ee7032c54e4fe0ffde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 <?>
        * 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

diff --git a/src/text.c b/src/text.c
index f4892c35d691220830780afba09685b4b7c6a2e6..783f64f9497b9f38ddf58692ea0f7531528e24d4 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -386,7 +386,7 @@ void do_undo(void)
         for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
            ;
     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;
     }
 #ifdef DEBUG
@@ -484,7 +484,7 @@ void do_undo(void)
        f->data = data;
        break;
     default:
-       undidmsg = _("wtf?");
+       undidmsg = _("Internal error: unknown type.  Please save your work");
        break;
 
     }
@@ -509,7 +509,7 @@ void do_redo(void)
        return;
     }
     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;
     }
 
@@ -520,7 +520,7 @@ void do_redo(void)
         for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
            ;
     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;
     }
 #ifdef DEBUG
@@ -630,7 +630,7 @@ void do_redo(void)
        cutbottom = oldcutbottom;
        break;
     default:
-       undidmsg = _("wtf?");
+       undidmsg = _("Internal error: unknown type.  Please save your work");
        break;
 
     }
@@ -879,7 +879,7 @@ void add_undo(undo_type current_action)
     case UNCUT:
        break;
     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;
     }