Adjusting whitespace after the previous change.

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

diff --git a/ChangeLog b/ChangeLog
index 75691fc62d61e47cd9d3e15d35594a231478bb96..afa0a2fbbe7128d08922a4517f41d7ab93089ced 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
        the appearance of an extra newline when undoing the Backspace/Delete.
        Patch partially by Mark Majeres.  The problem was first reported in
        https://lists.gnu.org/archive/html/nano-devel/2015-06/msg00003.html.
+       * src/text.c (do_undo): Adjust whitespace after the previous change.
 
 2015-06-14  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (edit_draw): Add some debugging code to track which

diff --git a/src/text.c b/src/text.c
index a0e801d46b0b5252c33701e8d212b4e76d7bb3f0..5d00702faca6f8a3d8013df3beb96320443d0def 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -503,17 +503,17 @@ void do_undo(void)
        undidmsg = _("line join");
        /* When the join was done by a Backspace at the tail of the file,
         * don't actually add another line; just position the cursor. */
-       if (f->next != openfile->filebot || u->xflags != UNdel_backspace ||
-               ISSET(NO_NEWLINES)) {
-       t = make_new_node(f);
-       t->data = mallocstrcpy(NULL, u->strdata);
-       data = mallocstrncpy(NULL, f->data, u->mark_begin_x + 1);
-       data[u->mark_begin_x] = '\0';
-       free(f->data);
-       f->data = data;
-       splice_node(f, t, f->next);
-       if (f == openfile->filebot)
-           openfile->filebot = t;
+       if (f->next != openfile->filebot || ISSET(NO_NEWLINES) ||
+               u->xflags != UNdel_backspace) {
+           t = make_new_node(f);
+           t->data = mallocstrcpy(NULL, u->strdata);
+           data = mallocstrncpy(NULL, f->data, u->mark_begin_x + 1);
+           data[u->mark_begin_x] = '\0';
+           free(f->data);
+           f->data = data;
+           splice_node(f, t, f->next);
+           if (f == openfile->filebot)
+               openfile->filebot = t;
        }
        goto_line_posx(u->lineno, u->begin);
        break;