tweaks: rename a function, to describe better what it does nowadays

master
Benno Schulenberg 2021-10-22 11:47:15 +02:00
parent 0f40752139
commit 9b419d0bff
4 changed files with 6 additions and 6 deletions

View File

@ -969,7 +969,7 @@ void shortcut_init(void)
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(do_wordlinechar_count, MMAIN, add_to_funcs(count_lines_words_and_characters, MMAIN,
N_("Word Count"), WITHORSANS(wordcount_gist), TOGETHER, VIEW); N_("Word Count"), WITHORSANS(wordcount_gist), TOGETHER, VIEW);
#endif #endif
@ -1334,7 +1334,7 @@ void shortcut_init(void)
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_sclist(MMAIN, "M-T", 0, cut_till_eof, 0); add_to_sclist(MMAIN, "M-T", 0, cut_till_eof, 0);
add_to_sclist(MEXECUTE, "^V", 0, cut_till_eof, 0); add_to_sclist(MEXECUTE, "^V", 0, cut_till_eof, 0);
add_to_sclist(MMAIN, "M-D", 0, do_wordlinechar_count, 0); add_to_sclist(MMAIN, "M-D", 0, count_lines_words_and_characters, 0);
#else #else
add_to_sclist(MMAIN, "M-H", 0, do_help, 0); add_to_sclist(MMAIN, "M-H", 0, do_help, 0);
#endif #endif

View File

@ -516,7 +516,7 @@ void do_linter(void);
void do_formatter(void); void do_formatter(void);
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
void do_wordlinechar_count(void); void count_lines_words_and_characters(void);
#endif #endif
void do_verbatim_input(void); void do_verbatim_input(void);
void complete_a_word(void); void complete_a_word(void);

View File

@ -319,7 +319,7 @@ keystruct *strtosc(const char *input)
else if (!strcmp(input, "findbracket")) else if (!strcmp(input, "findbracket"))
s->func = do_find_bracket; s->func = do_find_bracket;
else if (!strcmp(input, "wordcount")) else if (!strcmp(input, "wordcount"))
s->func = do_wordlinechar_count; s->func = count_lines_words_and_characters;
else if (!strcmp(input, "recordmacro")) else if (!strcmp(input, "recordmacro"))
s->func = record_macro; s->func = record_macro;
else if (!strcmp(input, "runmacro")) else if (!strcmp(input, "runmacro"))

View File

@ -2919,9 +2919,9 @@ void do_formatter(void)
#endif /* ENABLE_COLOR */ #endif /* ENABLE_COLOR */
#ifndef NANO_TINY #ifndef NANO_TINY
/* Our own version of "wc". Note that its character counts are in /* Our own version of "wc". Note that the character count is in
* multibyte characters instead of single-byte characters. */ * multibyte characters instead of single-byte characters. */
void do_wordlinechar_count(void) void count_lines_words_and_characters(void)
{ {
linestruct *was_current = openfile->current; linestruct *was_current = openfile->current;
size_t was_x = openfile->current_x; size_t was_x = openfile->current_x;