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

tweaks: add a helping variable, to slightly condense the code 

And to prepare for folding two blocks together.
master
Benno Schulenberg 2020-03-31 19:21:38 +02:00
parent 7660849b8f
commit a0e523cd4b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cut.c
View File

@ -565,6 +565,7 @@ void copy_text(void)
{ {
bool at_eol = (openfile->current->data[openfile->current_x] == '\0'); bool at_eol = (openfile->current->data[openfile->current_x] == '\0');
bool on_last_line = (openfile->current->next == NULL); bool on_last_line = (openfile->current->next == NULL);
size_t from_x = (ISSET(CUT_FROM_CURSOR)) ? openfile->current_x : 0;
linestruct *addition; linestruct *addition;
if (openfile->mark || openfile->last_action != COPY || !keep_cutbuffer) { if (openfile->mark || openfile->last_action != COPY || !keep_cutbuffer) {
@ -584,12 +585,11 @@ void copy_text(void)
} }
addition = make_new_node(NULL); addition = make_new_node(NULL);
addition->data = copy_of(openfile->current->data + from_x);
/* Create OR add to the cutbuffer, depending on the mode, the position /* Create OR add to the cutbuffer, depending on the mode, the position
* of the cursor, and whether or not the cutbuffer is currently empty. */ * of the cursor, and whether or not the cutbuffer is currently empty. */
if (ISSET(CUT_FROM_CURSOR)) { if (ISSET(CUT_FROM_CURSOR)) {
addition->data = copy_of(openfile->current->data + openfile->current_x);
if (cutbuffer == NULL && !at_eol) { if (cutbuffer == NULL && !at_eol) {
cutbuffer = addition; cutbuffer = addition;
cutbottom = addition; cutbottom = addition;
@ -609,8 +609,6 @@ void copy_text(void)
cutbottom = addition; cutbottom = addition;
} }
} else { } else {
addition->data = copy_of(openfile->current->data);
if (cutbuffer == NULL && on_last_line && ISSET(NO_NEWLINES)) { if (cutbuffer == NULL && on_last_line && ISSET(NO_NEWLINES)) {
cutbuffer = addition; cutbuffer = addition;
cutbottom = addition; cutbottom = addition;