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

tweaks: rename two parameters, to differentiate them from function names

master
Benno Schulenberg 2019-05-02 10:01:42 +02:00
parent fd3b3bc1d6
commit 083218aca5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cut.c
View File

@ -264,11 +264,11 @@ void cut_to_eof(void)
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
/* Move text from the current buffer into the cutbuffer. If /* Move text from the current buffer into the cutbuffer. If
* copy_text is TRUE, copy the text back into the buffer afterward. * copying is TRUE, copy the text back into the buffer afterward.
* If cut_till_eof is TRUE, move all text from the current cursor * If until_eof is TRUE, move all text from the current cursor
* position to the end of the file into the cutbuffer. If append * position to the end of the file into the cutbuffer. If append
* is TRUE (when zapping), always append the cut to the cutbuffer. */ * is TRUE (when zapping), always append the cut to the cutbuffer. */
void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append) void do_cut_text(bool copying, bool marked, bool until_eof, bool append)
{ {
#ifndef NANO_TINY #ifndef NANO_TINY
linestruct *was_bottom = NULL; linestruct *was_bottom = NULL;
@ -285,18 +285,18 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
/* Whether the previous operation was a copying operation. */ /* Whether the previous operation was a copying operation. */
/* If cuts were not continuous, or when cutting a region, clear the slate. */ /* If cuts were not continuous, or when cutting a region, clear the slate. */
if ((!keep_cutbuffer || marked || cut_till_eof || copy_text != precedent) && if ((!keep_cutbuffer || marked || until_eof || copying != precedent) &&
!append) { !append) {
free_lines(cutbuffer); free_lines(cutbuffer);
cutbuffer = NULL; cutbuffer = NULL;
} }
/* After a line operation, future ones should add to the cutbuffer. */ /* After a line operation, future ones should add to the cutbuffer. */
keep_cutbuffer = !marked && !cut_till_eof; keep_cutbuffer = !marked && !until_eof;
precedent = copy_text; precedent = copying;
#ifndef NANO_TINY #ifndef NANO_TINY
if (copy_text) { if (copying) {
/* If the cutbuffer isn't empty, remember where it currently ends. */ /* If the cutbuffer isn't empty, remember where it currently ends. */
if (cutbuffer != NULL) { if (cutbuffer != NULL) {
was_bottom = cutbottom; was_bottom = cutbottom;
@ -306,7 +306,7 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
SET(NO_NEWLINES); SET(NO_NEWLINES);
} }
if (cut_till_eof) { if (until_eof) {
/* Move all text up to the end of the file into the cutbuffer. */ /* Move all text up to the end of the file into the cutbuffer. */
cut_to_eof(); cut_to_eof();
} else if (openfile->mark) { } else if (openfile->mark) {
@ -322,7 +322,7 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
cut_line(); cut_line();
#ifndef NANO_TINY #ifndef NANO_TINY
if (copy_text) { if (copying) {
/* Copy the text that was put into the cutbuffer back into the current /* Copy the text that was put into the cutbuffer back into the current
* file buffer, so that in the end nothing has been deleted. */ * file buffer, so that in the end nothing has been deleted. */
if (cutbuffer != NULL) { if (cutbuffer != NULL) {

2
src/proto.h
View File

@ -254,7 +254,7 @@ void chop_previous_word(void);
void chop_next_word(void); void chop_next_word(void);
void cut_marked(bool *right_side_up); void cut_marked(bool *right_side_up);
#endif #endif
void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append); void do_cut_text(bool copying, bool marked, bool until_eof, bool append);
bool is_cuttable(bool test_cliff); bool is_cuttable(bool test_cliff);
void do_cut_text_void(void); void do_cut_text_void(void);
#ifndef NANO_TINY #ifndef NANO_TINY