From b0e04c0de3e4bf19673790366b91725984d6db09 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 8 Dec 2005 07:24:54 +0000 Subject: [PATCH] a few last comment and consistency fixes git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3238 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ src/files.c | 2 +- src/rcfile.c | 4 ++-- src/text.c | 2 +- src/winio.c | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f011cbe..04e42138 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,9 @@ CVS code - - Since proto.h includes nano.h, and nano.h includes config.h first, include proto.h first and remove redundant includes of config.h in all non-header source files. (DLR) + - Refer to the Enter key instead of the Return key for + consistency. Changes to load_history() and rcfile_error(). + (DLR) - browser.c: do_browser() - When setting the width of each file, use the "?" operator diff --git a/src/files.c b/src/files.c index 12fde7bf..e61a3122 100644 --- a/src/files.c +++ b/src/files.c @@ -2335,7 +2335,7 @@ void load_history(void) rcfile_error(N_("Error reading %s: %s"), nanohist, strerror(errno)); fprintf(stderr, - _("\nPress Return to continue starting nano\n")); + _("\nPress Enter to continue starting nano\n")); while (getchar() != '\n') ; } diff --git a/src/rcfile.c b/src/rcfile.c index e55eac6f..fd58867a 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -107,7 +107,7 @@ static colortype *endcolor = NULL; #endif /* We have an error in some part of the rcfile. Put it on stderr and - * make the user hit Return to continue starting up nano. */ + * make the user hit Enter to continue starting up nano. */ void rcfile_error(const char *msg, ...) { va_list ap; @@ -735,7 +735,7 @@ void parse_rcfile(FILE *rcstream) if (errors) { errors = FALSE; - fprintf(stderr, _("\nPress Return to continue starting nano\n")); + fprintf(stderr, _("\nPress Enter to continue starting nano\n")); while (getchar() != '\n') ; } diff --git a/src/text.c b/src/text.c index b34ffaaa..3461e66e 100644 --- a/src/text.c +++ b/src/text.c @@ -192,7 +192,7 @@ void do_tab(void) #endif } -/* Someone hits Enter/Return *gasp!* */ +/* Someone hits Enter *gasp!* */ void do_enter(void) { filestruct *newnode = make_new_node(openfile->current); diff --git a/src/winio.c b/src/winio.c index bc75a7bc..e7b4b92d 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2285,9 +2285,9 @@ void edit_draw(const filestruct *fileptr, const char *converted, int if (tmpcolor->bright) wattron(edit, A_BOLD); wattron(edit, COLOR_PAIR(tmpcolor->pairnum)); - /* Two notes about regexec(). Return value 0 means there is - * a match. Also, rm_eo is the first non-matching character - * after the match. */ + /* Two notes about regexec(). A return value of zero means + * that there is a match. Also, rm_eo is the first + * non-matching character after the match. */ /* First case, tmpcolor is a single-line expression. */ if (tmpcolor->end == NULL) { -- 2.39.5