ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle two lines and improve two comments

master
Benno Schulenberg 2016-06-16 11:54:11 +02:00
parent 95f417fa9a
commit 17fb6dfdc0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nano.c
View File

@ -437,14 +437,14 @@ void copy_from_filestruct(filestruct *somebuffer)
#endif #endif
/* Partition the filestruct so that it contains no text, and remember /* Partition the filestruct so that it contains no text, and remember
* whether the top of the edit window is at the start of the buffer. */ * whether the current line is at the top of the edit window. */
filepart = partition_filestruct(openfile->current, openfile->current_x, filepart = partition_filestruct(openfile->current, openfile->current_x,
openfile->current, openfile->current_x); openfile->current, openfile->current_x);
edittop_inside = (openfile->edittop == openfile->fileage); edittop_inside = (openfile->edittop == openfile->fileage);
free_filestruct(openfile->fileage);
/* Put the top and bottom of the current filestruct at the top and /* Put the top and bottom of the current filestruct at the top and
* bottom of a copy of the passed buffer. */ * bottom of a copy of the passed buffer. */
free_filestruct(openfile->fileage);
openfile->fileage = copy_filestruct(somebuffer); openfile->fileage = copy_filestruct(somebuffer);
openfile->filebot = openfile->fileage; openfile->filebot = openfile->fileage;
while (openfile->filebot->next != NULL) while (openfile->filebot->next != NULL)
@ -487,13 +487,13 @@ void copy_from_filestruct(filestruct *somebuffer)
* tacked onto the current line. */ * tacked onto the current line. */
openfile->current_y += openfile->filebot->lineno - 1; openfile->current_y += openfile->filebot->lineno - 1;
top_save = openfile->fileage; /* If we pasted onto the first line of the edit window, the corresponding
* struct has been freed, so... point at the start of the copied text. */
/* If the top of the edit window is inside the partition, set it to
* where the copied text now starts. */
if (edittop_inside) if (edittop_inside)
openfile->edittop = openfile->fileage; openfile->edittop = openfile->fileage;
top_save = openfile->fileage;
/* Unpartition the filestruct so that it contains all the text /* Unpartition the filestruct so that it contains all the text
* again, plus the copied text. */ * again, plus the copied text. */
unpartition_filestruct(&filepart); unpartition_filestruct(&filepart);