Not speaking of "line wrap" but of "text add" when undoing/redoing

text additions that caused automatic line breaks.
Patch by Mark Majeres.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5064 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 5522d837c64ac1acd9e00fa98b4cd128bdc5e845..6635d7df10a16ff67b30c2225b4783d5ec9e5644 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-11  Mark Majeres  <mark@engine12.com>
+       * src/text.c (do_undo, do_redo): Do not speak of "line wrap"
+       but instead of "text add" when undoing/redoing text additions
+       that caused automatic line breaks.
+
 2014-07-11  Benno Schulenberg  <bensberg@justemail.net>
        * src/files.c (write_lockfile): Refix typo in error message.
 

diff --git a/src/text.c b/src/text.c
index 807701aefec5154c2cc374c9aca934d9e667b0e6..e5315eb63b524ed47df4cdf412524ee330856b34 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -433,7 +433,7 @@ void do_undo(void)
     undo *u = openfile->current_undo;
     filestruct *t = 0;
     size_t len = 0;
-    char *undidmsg, *data;
+    char *data, *undidmsg = NULL;
 
     if (!u) {
        statusbar(_("Nothing in undo buffer!"));
@@ -476,7 +476,6 @@ void do_undo(void)
        break;
 #ifndef DISABLE_WRAPPING
     case SPLIT_END:
-       undidmsg = _("line wrap");
        goto_line_posx(u->lineno, u->begin);
        openfile->current_undo = openfile->current_undo->next;
        openfile->last_action = OTHER;
@@ -484,6 +483,8 @@ void do_undo(void)
            do_undo();
        u = openfile->current_undo;
        f = openfile->current;
+    case SPLIT_BEGIN:
+       undidmsg = _("text add");
        break;
 #endif /* !DISABLE_WRAPPING */
     case JOIN:
@@ -554,7 +555,8 @@ void do_undo(void)
        break;
     }
 
-    statusbar(_("Undid action (%s)"), undidmsg);
+    if (undidmsg)
+       statusbar(_("Undid action (%s)"), undidmsg);
 
     renumber(f);
     openfile->current_undo = openfile->current_undo->next;
@@ -568,7 +570,7 @@ void do_redo(void)
 {
     undo *u = openfile->undotop;
     size_t len = 0;
-    char *redidmsg, *data;
+    char *data, *redidmsg = NULL;
 
     for (; u != NULL && u->next != openfile->current_undo; u = u->next)
        ;
@@ -622,7 +624,6 @@ void do_redo(void)
        break;
 #ifndef DISABLE_WRAPPING
     case SPLIT_BEGIN:
-       redidmsg = _("line wrap");
        goto_line_posx(u->lineno, u->begin);
        openfile->current_undo = u;
        openfile->last_action = OTHER;
@@ -630,6 +631,8 @@ void do_redo(void)
            do_redo();
        u = openfile->current_undo;
        goto_line_posx(u->lineno, u->begin);
+    case SPLIT_END:
+       redidmsg = _("text add");
        break;
 #endif /* !DISABLE_WRAPPING */
     case JOIN:
@@ -675,7 +678,8 @@ void do_redo(void)
        break;
     }
 
-    statusbar(_("Redid action (%s)"), redidmsg);
+    if (redidmsg)
+       statusbar(_("Redid action (%s)"), redidmsg);
 
     openfile->current_undo = u;
     openfile->last_action = OTHER;