a few last comment and consistency fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3238 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-12-08 07:24:54 +00:00
parent 6d6a36c647
commit b0e04c0de3
5 changed files with 10 additions and 7 deletions

View File

@ -129,6 +129,9 @@ CVS code -
- Since proto.h includes nano.h, and nano.h includes config.h - Since proto.h includes nano.h, and nano.h includes config.h
first, include proto.h first and remove redundant includes of first, include proto.h first and remove redundant includes of
config.h in all non-header source files. (DLR) 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: - browser.c:
do_browser() do_browser()
- When setting the width of each file, use the "?" operator - When setting the width of each file, use the "?" operator

View File

@ -2335,7 +2335,7 @@ void load_history(void)
rcfile_error(N_("Error reading %s: %s"), nanohist, rcfile_error(N_("Error reading %s: %s"), nanohist,
strerror(errno)); strerror(errno));
fprintf(stderr, fprintf(stderr,
_("\nPress Return to continue starting nano\n")); _("\nPress Enter to continue starting nano\n"));
while (getchar() != '\n') while (getchar() != '\n')
; ;
} }

View File

@ -107,7 +107,7 @@ static colortype *endcolor = NULL;
#endif #endif
/* We have an error in some part of the rcfile. Put it on stderr and /* 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, ...) void rcfile_error(const char *msg, ...)
{ {
va_list ap; va_list ap;
@ -735,7 +735,7 @@ void parse_rcfile(FILE *rcstream)
if (errors) { if (errors) {
errors = FALSE; errors = FALSE;
fprintf(stderr, _("\nPress Return to continue starting nano\n")); fprintf(stderr, _("\nPress Enter to continue starting nano\n"));
while (getchar() != '\n') while (getchar() != '\n')
; ;
} }

View File

@ -192,7 +192,7 @@ void do_tab(void)
#endif #endif
} }
/* Someone hits Enter/Return *gasp!* */ /* Someone hits Enter *gasp!* */
void do_enter(void) void do_enter(void)
{ {
filestruct *newnode = make_new_node(openfile->current); filestruct *newnode = make_new_node(openfile->current);

View File

@ -2285,9 +2285,9 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
if (tmpcolor->bright) if (tmpcolor->bright)
wattron(edit, A_BOLD); wattron(edit, A_BOLD);
wattron(edit, COLOR_PAIR(tmpcolor->pairnum)); wattron(edit, COLOR_PAIR(tmpcolor->pairnum));
/* Two notes about regexec(). Return value 0 means there is /* Two notes about regexec(). A return value of zero means
* a match. Also, rm_eo is the first non-matching character * that there is a match. Also, rm_eo is the first
* after the match. */ * non-matching character after the match. */
/* First case, tmpcolor is a single-line expression. */ /* First case, tmpcolor is a single-line expression. */
if (tmpcolor->end == NULL) { if (tmpcolor->end == NULL) {