mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport r5400 from trunk. 

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_4_branch@5423 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2015-11-15 07:09:13 +00:00
parent 757fd8384e
commit ca11b36620
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

14
src/text.c
View File

@ -628,8 +628,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:
@ -1116,6 +1125,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