From f1d9fcc77b15b6efe72b6d442bb019fca0d2e89e Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 11 Nov 2015 18:51:39 +0000
Subject: [PATCH] Redoing an Enter from stored undo data, instead of running
do_enter() again, because the latter behaves differently depending on the
setting of autoindent.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5400 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 6 ++++++
src/text.c | 14 ++++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6127a56..430ca8e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-11 Benno Schulenberg <bensberg@justemail.net>
+ * src/text.c (do_redo, update_undo): Redo an Enter from the stored
+ undo data, instead of running do_enter() again, because the latter
+ will behave differently depending on the setting of autoindent.
+ This addresses Debian bug #793053 reported by Clancy.
+
2015-11-10 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (edit_draw): Skip a zero-length match only when there
/is/ a match. Found with valgrind. This fixes Savannah bug #41908.
diff --git a/src/text.c b/src/text.c
index 1dfaacdc..ff9951d7 100644
--- a/src/text.c
+++ b/src/text.c
@@ -677,8 +677,17 @@ void do_redo(void)
break;
case ENTER:
redidmsg = _("line break");
- goto_line_posx(u->lineno, u->begin);
- do_enter(TRUE);
+ filestruct *shoveline = make_new_node(f);
+ shoveline->data = mallocstrcpy(NULL, u->strdata);
+ data = mallocstrncpy(NULL, f->data, u->begin + 1);
+ data[u->begin] = '\0';
+ free(f->data);
+ f->data = data;
+ splice_node(f, shoveline, f->next);
+ if (f == openfile->filebot)
+ openfile->filebot = shoveline;
+ renumber(shoveline);
+ goto_line_posx(u->lineno + 1, u->mark_begin_x);
break;
#ifndef DISABLE_WRAPPING
case SPLIT_BEGIN:
@@ -1156,6 +1165,7 @@ fprintf(stderr, " >> Updating... action = %d, fs->last_action = %d, openfile->c
u->mark_begin_lineno = openfile->current->lineno;
break;
case ENTER:
+ u->strdata = mallocstrcpy(NULL, fs->current->data);
u->mark_begin_x = fs->current_x;
break;
#ifndef DISABLE_WRAPPING
--
GitLab