From 07f14de995741cbdd7930380642df5c1abb43a9b Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 12 May 2014 12:11:24 +0000
Subject: [PATCH] Improving some comments, and removing some mispasted or
superfluous ones.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4858 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
src/rcfile.c | 15 +++++----------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 429020f0..80441f8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2014-05-12 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_spell): Provide startup feedback, as for the linter.
* doc/syntax/nanorc.nanorc: Show bright foreground colours as valid.
+ * src/rcfile.c: Improve some comments, and remove some others that
+ are mispasted or superfluous.
2014-05-10 Chris Allegretta <chrisa@asty.org>
* src/rcfile.c (parse_color_names): Redefine false and true to
diff --git a/src/rcfile.c b/src/rcfile.c
index 680e130b..ce654050 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -347,10 +347,9 @@ void parse_syntax(char *ptr)
return;
}
- /* Now load the extensions into their part of the struct. */
+ /* Now load the extension regexes into their part of the struct. */
while (*ptr != '\0') {
exttype *newext;
- /* The new extension structure. */
while (*ptr != '"' && *ptr != '\0')
ptr++;
@@ -383,7 +382,7 @@ void parse_syntax(char *ptr)
}
}
-/* Parse the magic regex that may influence the choice of syntax. */
+/* Parse the magic regexes that may influence the choice of syntax. */
void parse_magictype(char *ptr)
{
#ifdef HAVE_LIBMAGIC
@@ -413,10 +412,9 @@ void parse_magictype(char *ptr)
fprintf(stderr, "Starting a magic type: \"%s\"\n", ptr);
#endif
- /* Now load the extensions into their part of the struct. */
+ /* Now load the magic regexes into their part of the struct. */
while (*ptr != '\0') {
exttype *newext;
- /* The new extension structure. */
while (*ptr != '"' && *ptr != '\0')
ptr++;
@@ -739,7 +737,7 @@ void parse_colors(char *ptr, bool icase)
* in the colorstrings array, woo! */
while (ptr != NULL && *ptr != '\0') {
colortype *newcolor;
- /* The new color structure. */
+ /* The container for a color plus its regexes. */
bool cancelled = FALSE;
/* The start expression was bad. */
bool expectend = FALSE;
@@ -878,7 +876,7 @@ bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
return TRUE;
}
-/* Parse the header-line regex that may influence the choice of syntax. */
+/* Parse the header-line regexes that may influence the choice of syntax. */
void parse_headers(char *ptr)
{
char *regstr;
@@ -896,11 +894,8 @@ void parse_headers(char *ptr)
return;
}
- /* Now for the fun part. Start adding regexes to individual strings
- * in the colorstrings array, woo! */
while (ptr != NULL && *ptr != '\0') {
exttype *newheader;
- /* The new color structure. */
if (*ptr != '"') {
rcfile_error(
--
GitLab