Index: src/cut.c =================================================================== --- src/cut.c (revision 5035) +++ src/cut.c (working copy) @@ -120,11 +120,11 @@ /* Move text from the current filestruct into the cutbuffer. If * copy_text is TRUE, copy the text back into the filestruct afterward. - * If cut_till_end is TRUE, move all text from the current cursor + * If cut_till_eof is TRUE, move all text from the current cursor * position to the end of the file into the cutbuffer. */ void do_cut_text( #ifndef NANO_TINY - bool copy_text, bool cut_till_end, bool undoing + bool copy_text, bool cut_till_eof, bool undoing #else void #endif @@ -173,8 +173,8 @@ keep_cutbuffer = TRUE; #ifndef NANO_TINY - if (cut_till_end) { - /* If cut_till_end is TRUE, move all text up to the end of the + if (cut_till_eof) { + /* If cut_till_eof is TRUE, move all text up to the end of the * file into the cutbuffer. */ cut_to_eof(); } else if (openfile->mark_set) { @@ -215,7 +215,7 @@ if (!old_no_newlines) UNSET(NO_NEWLINES); } else if (!undoing) - update_undo(cut_till_end ? CUT_EOF : CUT); + update_undo(cut_till_eof ? CUT_EOF : CUT); /* Leave the text in the cutbuffer, and mark the file as * modified. */ @@ -268,7 +268,7 @@ } /* Cut from the current cursor position to the end of the file. */ -void do_cut_till_end(void) +void do_cut_till_eof(void) { add_undo(CUT_EOF); do_cut_text(FALSE, TRUE, FALSE); Index: src/global.c =================================================================== --- src/global.c (revision 5032) +++ src/global.c (working copy) @@ -571,7 +571,7 @@ const char *nano_backspace_msg = N_("Delete the character to the left of the cursor"); #ifndef NANO_TINY - const char *nano_cut_till_end_msg = + const char *nano_cut_till_eof_msg = N_("Cut from the cursor position to the end of the file"); #endif #ifndef DISABLE_JUSTIFY @@ -869,8 +869,8 @@ NOVIEW); #ifndef NANO_TINY - add_to_funcs(do_cut_till_end, MMAIN, - N_("CutTillEnd"), IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW); + add_to_funcs(do_cut_till_eof, MMAIN, + N_("CutTillEnd"), IFSCHELP(nano_cut_till_eof_msg), TRUE, NOVIEW); #endif #ifndef DISABLE_JUSTIFY @@ -1062,7 +1062,7 @@ #endif add_to_sclist(MMOST, "M-V", do_verbatim_input, 0); #ifndef NANO_TINY - add_to_sclist(MMAIN, "M-T", do_cut_till_end, 0); + add_to_sclist(MMAIN, "M-T", do_cut_till_eof, 0); add_to_sclist(MMAIN, "M-D", do_wordlinechar_count, 0); #endif #ifndef DISABLE_JUSTIFY @@ -1276,7 +1276,7 @@ s->scfunc = do_uncut_text; #ifndef NANO_TINY else if (!strcasecmp(input, "cutrestoffile")) - s->scfunc = do_cut_till_end; + s->scfunc = do_cut_till_eof; else if (!strcasecmp(input, "copytext")) s->scfunc = do_copy_text; else if (!strcasecmp(input, "mark")) Index: src/nano.c =================================================================== --- src/nano.c (revision 5035) +++ src/nano.c (working copy) @@ -1691,7 +1691,7 @@ * cutting or copying text, remember this. */ if (s->scfunc == do_cut_text_void #ifndef NANO_TINY - || s->scfunc == do_copy_text || s->scfunc == do_cut_till_end + || s->scfunc == do_copy_text || s->scfunc == do_cut_till_eof #endif ) preserve = TRUE; Index: src/proto.h =================================================================== --- src/proto.h (revision 5032) +++ src/proto.h (working copy) @@ -256,7 +256,7 @@ #endif void do_cut_text( #ifndef NANO_TINY - bool copy_text, bool cut_till_end, bool undoing + bool copy_text, bool cut_till_eof, bool undoing #else void #endif @@ -264,7 +264,7 @@ void do_cut_text_void(void); #ifndef NANO_TINY void do_copy_text(void); -void do_cut_till_end(void); +void do_cut_till_eof(void); #endif void do_uncut_text(void);