mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-26 03:02:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: reshuffle an assignment, for conciseness, and rename a variable

Browse Source
This commit is contained in:
Benno Schulenberg 2020-05-17 11:34:22 +02:00
parent 187843d2da
commit 40a0463250
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/cut.c
View File

@ -347,13 +347,13 @@ void extract_segment(linestruct *top, size_t top_x, linestruct *bot, size_t bot_
* at the current cursor position. */ * at the current cursor position. */
void ingraft_buffer(linestruct *topline) void ingraft_buffer(linestruct *topline)
{ {
size_t length = strlen(openfile->current->data); linestruct *line = openfile->current;
size_t length = strlen(line->data);
size_t extralen = strlen(topline->data); size_t extralen = strlen(topline->data);
size_t xpos = openfile->current_x; size_t xpos = openfile->current_x;
char *tailtext = copy_of(openfile->current->data + xpos); char *tailtext = copy_of(line->data + xpos);
linestruct *line = openfile->current;
#ifndef NANO_TINY #ifndef NANO_TINY
bool placed_after = (openfile->mark == line && !mark_is_before_cursor()); bool mark_follows = (openfile->mark == line && !mark_is_before_cursor());
#endif #endif
linestruct *botline = topline; linestruct *botline = topline;
@ -401,10 +401,10 @@ void ingraft_buffer(linestruct *topline)
#ifndef NANO_TINY #ifndef NANO_TINY
/* When needed, update the mark's pointer and position. */ /* When needed, update the mark's pointer and position. */
if (placed_after && topline != botline) { if (mark_follows && topline != botline) {
openfile->mark = botline; openfile->mark = botline;
openfile->mark_x += length - xpos; openfile->mark_x += length - xpos;
} else if (placed_after) } else if (mark_follows)
openfile->mark_x += extralen; openfile->mark_x += extralen;
#endif #endif