From 8e94234b00c8f3f81200e13b7ab9b5488f3cc11e Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Mon, 25 Jul 2005 04:21:46 +0000 Subject: [PATCH] rename do_word_count() do_wordlinechar_count(), and simplify its final message a bit git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2925 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++-- src/global.c | 2 +- src/proto.h | 2 +- src/text.c | 12 ++++++------ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae412ec1..44d1ef1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -208,8 +208,9 @@ CVS code - - Make parameters const where possible. (DLR) - text.c: do_word_count() - - Expand to also count the number of lines and characters in the - file or selection, as wc does. (DLR) + - Rename to do_wordlinechar_count(), and expand to also count + the number of lines and characters in the file or selection, + as wc does. (DLR) - winio.c: edit_redraw(), edit_refresh() - Clean up and simplify. (DLR) diff --git a/src/global.c b/src/global.c index 8917b063..d6b38abe 100644 --- a/src/global.c +++ b/src/global.c @@ -544,7 +544,7 @@ void shortcut_init(bool unjustify) sc_init_one(&main_list, NANO_NO_KEY, N_("Word Count"), IFHELP(nano_wordcount_msg, NANO_WORDCOUNT_KEY), NANO_NO_KEY, - NANO_NO_KEY, VIEW, do_word_count); + NANO_NO_KEY, VIEW, do_wordlinechar_count); #endif #ifndef DISABLE_JUSTIFY diff --git a/src/proto.h b/src/proto.h index 877a03dc..aacd8e46 100644 --- a/src/proto.h +++ b/src/proto.h @@ -529,7 +529,7 @@ const char *do_alt_speller(char *tempfile_name); void do_spell(void); #endif #ifndef NANO_SMALL -void do_word_count(void); +void do_wordlinechar_count(void); #endif /* Public functions in utils.c. */ diff --git a/src/text.c b/src/text.c index b7fec6f9..f5cf8684 100644 --- a/src/text.c +++ b/src/text.c @@ -2047,7 +2047,7 @@ void do_spell(void) #endif /* !DISABLE_SPELLER */ #ifndef NANO_SMALL -void do_word_count(void) +void do_wordlinechar_count(void) { size_t words = 0, lines = 0, chars = 0; size_t current_x_save = openfile->current_x; @@ -2115,10 +2115,10 @@ void do_word_count(void) /* Display the total word, line, and character counts on the * statusbar. */ - statusbar("%s: %lu %s, %lu %s, %lu %s", old_mark_set ? - _("In selection") : _("In file"), (unsigned long)words, - P_("word", "words", (unsigned long)words), (unsigned long)lines, - P_("line", "lines", (unsigned long)lines), (unsigned long)chars, - P_("char", "chars", (unsigned long)chars)); + statusbar("%s%lu %s, %lu %s, %lu %s", old_mark_set ? + _("In selection: ") : "", (unsigned long)words, P_("word", + "words", (unsigned long)words), (unsigned long)lines, P_("line", + "lines", (unsigned long)lines), (unsigned long)chars, P_("char", + "chars", (unsigned long)chars)); } #endif /* !NANO_SMALL */ -- 2.39.5