tweaks: rename two variables, to indicate better what they mean

master
Benno Schulenberg 2019-01-06 15:46:23 +01:00
parent f74a120803
commit 0c42c51aa4
2 changed files with 5 additions and 4 deletions

View File

@ -289,7 +289,8 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
size_t cb_save_len = 0; size_t cb_save_len = 0;
/* The length of the string at the current end of the cutbuffer, /* The length of the string at the current end of the cutbuffer,
* before we add text to it. */ * before we add text to it. */
bool old_no_newlines = ISSET(NO_NEWLINES); bool using_magicline = !ISSET(NO_NEWLINES);
/* Whether an automatic newline should be added at end-of-buffer. */
bool right_side_up = TRUE; bool right_side_up = TRUE;
/* There *is* no region, *or* it is marked forward. */ /* There *is* no region, *or* it is marked forward. */
#endif #endif
@ -347,7 +348,7 @@ void do_cut_text(bool copy_text, bool marked, bool cut_till_eof, bool append)
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
} }
/* Restore the magic-line behavior now that we're done fiddling. */ /* Restore the magic-line behavior now that we're done fiddling. */
if (!old_no_newlines) if (using_magicline)
UNSET(NO_NEWLINES); UNSET(NO_NEWLINES);
} else } else
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */

View File

@ -557,7 +557,7 @@ void replace_marked_buffer(const char *filename)
{ {
FILE *f; FILE *f;
int descriptor; int descriptor;
bool old_no_newlines = ISSET(NO_NEWLINES); bool using_magicline = !ISSET(NO_NEWLINES);
filestruct *was_cutbuffer = cutbuffer; filestruct *was_cutbuffer = cutbuffer;
descriptor = open_file(filename, FALSE, TRUE, &f); descriptor = open_file(filename, FALSE, TRUE, &f);
@ -583,7 +583,7 @@ void replace_marked_buffer(const char *filename)
read_file(f, descriptor, filename, TRUE); read_file(f, descriptor, filename, TRUE);
/* Restore the magic-line behavior now that we're done fiddling. */ /* Restore the magic-line behavior now that we're done fiddling. */
if (!old_no_newlines) if (using_magicline)
UNSET(NO_NEWLINES); UNSET(NO_NEWLINES);
add_undo(COUPLE_END); add_undo(COUPLE_END);