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

tweaks: place a function better, and reduce some comments to a single one

master
Benno Schulenberg 2019-05-02 10:14:08 +02:00
parent 083218aca5
commit 3346c5395e
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/cut.c
View File

@ -218,23 +218,11 @@ void cut_line(void)
else else
extract(openfile->current, 0, extract(openfile->current, 0,
openfile->current, strlen(openfile->current->data)); openfile->current, strlen(openfile->current->data));
openfile->placewewant = 0; openfile->placewewant = 0;
} }
#ifndef NANO_TINY #ifndef NANO_TINY
/* Move all marked text from the current buffer into the cutbuffer. */
void cut_marked(bool *right_side_up)
{
linestruct *top, *bot;
size_t top_x, bot_x;
get_region((const linestruct **)&top, &top_x,
(const linestruct **)&bot, &bot_x, right_side_up);
extract(top, top_x, bot, bot_x);
openfile->placewewant = xplustabs();
}
/* Move all text from the cursor position until the end of this line into /* Move all text from the cursor position until the end of this line into
* the cutbuffer. But when already at the end of a line, then move this * the cutbuffer. But when already at the end of a line, then move this
* "newline" to the cutbuffer. */ * "newline" to the cutbuffer. */
@ -255,6 +243,20 @@ void cut_to_eol(void)
} }
} }
/* Move all marked text from the current buffer into the cutbuffer. */
void cut_marked(bool *right_side_up)
{
linestruct *top, *bot;
size_t top_x, bot_x;
get_region((const linestruct **)&top, &top_x,
(const linestruct **)&bot, &bot_x, right_side_up);
extract(top, top_x, bot, bot_x);
openfile->placewewant = xplustabs();
}
/* Move all text from the cursor position to end-of-file into the cutbuffer. */ /* Move all text from the cursor position to end-of-file into the cutbuffer. */
void cut_to_eof(void) void cut_to_eof(void)
{ {
@ -306,19 +308,16 @@ void do_cut_text(bool copying, bool marked, bool until_eof, bool append)
SET(NO_NEWLINES); SET(NO_NEWLINES);
} }
if (until_eof) { /* Now move the relevant piece of text into the cutbuffer. */
/* Move all text up to the end of the file into the cutbuffer. */ if (until_eof)
cut_to_eof(); cut_to_eof();
} else if (openfile->mark) { else if (openfile->mark) {
/* Move the marked text to the cutbuffer, and turn the mark off. */
cut_marked(&right_side_up); cut_marked(&right_side_up);
openfile->mark = NULL; openfile->mark = NULL;
} else if (ISSET(CUT_FROM_CURSOR)) } else if (ISSET(CUT_FROM_CURSOR))
/* Move all text up to the end of the line into the cutbuffer. */
cut_to_eol(); cut_to_eol();
else else
#endif #endif
/* Move the entire line into the cutbuffer. */
cut_line(); cut_line();
#ifndef NANO_TINY #ifndef NANO_TINY