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

tweaks: change a helping variable, to make two blocks still more similar

master
Benno Schulenberg 2020-03-31 19:26:39 +02:00
parent a0e523cd4b
commit 38bbdf8fc3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cut.c
View File

@ -564,7 +564,7 @@ void copy_marked_region(void)
void copy_text(void) 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 sans_newline = (ISSET(NO_NEWLINES) && openfile->current->next == NULL);
size_t from_x = (ISSET(CUT_FROM_CURSOR)) ? openfile->current_x : 0; size_t from_x = (ISSET(CUT_FROM_CURSOR)) ? openfile->current_x : 0;
linestruct *addition; linestruct *addition;
@ -587,10 +587,13 @@ void copy_text(void)
addition = make_new_node(NULL); addition = make_new_node(NULL);
addition->data = copy_of(openfile->current->data + from_x); addition->data = copy_of(openfile->current->data + from_x);
if (ISSET(CUT_FROM_CURSOR))
sans_newline = !at_eol;
/* 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)) {
if (cutbuffer == NULL && !at_eol) { if (cutbuffer == NULL && sans_newline) {
cutbuffer = addition; cutbuffer = addition;
cutbottom = addition; cutbottom = addition;
} else if (cutbuffer == NULL) { } else if (cutbuffer == NULL) {
@ -598,7 +601,7 @@ void copy_text(void)
cutbottom = make_new_node(cutbuffer); cutbottom = make_new_node(cutbuffer);
cutbottom->data = copy_of(""); cutbottom->data = copy_of("");
cutbuffer->next = cutbottom; cutbuffer->next = cutbottom;
} else if (!at_eol) { } else if (sans_newline) {
addition->prev = cutbottom->prev; addition->prev = cutbottom->prev;
addition->prev->next = addition; addition->prev->next = addition;
delete_node(cutbottom); delete_node(cutbottom);
@ -609,7 +612,7 @@ void copy_text(void)
cutbottom = addition; cutbottom = addition;
} }
} else { } else {
if (cutbuffer == NULL && on_last_line && ISSET(NO_NEWLINES)) { if (cutbuffer == NULL && sans_newline ) {
cutbuffer = addition; cutbuffer = addition;
cutbottom = addition; cutbottom = addition;
} else if (cutbuffer == NULL) { } else if (cutbuffer == NULL) {
@ -617,7 +620,7 @@ void copy_text(void)
cutbottom = make_new_node(cutbuffer); cutbottom = make_new_node(cutbuffer);
cutbottom->data = copy_of(""); cutbottom->data = copy_of("");
cutbuffer->next = cutbottom; cutbuffer->next = cutbottom;
} else if (on_last_line && ISSET(NO_NEWLINES)) { } else if (sans_newline) {
addition->prev = cutbottom->prev; addition->prev = cutbottom->prev;
addition->prev->next = addition; addition->prev->next = addition;
delete_node(cutbottom); delete_node(cutbottom);