nano

commit 5dde918e24f21f6d19462ed658e8874c337ffbeb
parent 300e27745be17903b88ffdf656eb3a28db45f8a5
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Fri, 11 Jul 2014 19:14:25 +0000

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
src/text.c
 | 
16
++++++++++------

2 files changed, 15 insertions(+), 6 deletions(-)
diff --git 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
@@ -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;