From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 29 Feb 2016 10:54:48 +0000 (+0000)
Subject: Arranging some things more orderly.
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=773fc447df0731da442b988934194873440bf4a8;p=nano.git

Arranging some things more orderly.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5699 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 8078dbbd..a913c0be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2016-02-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.h, src/rcfile.c, src/color.c: Rename a struct member.
 	* src/rcfile.c (parse_rcfile): Don't allocate struct for none syntax.
+	* src/nano.h, src/rcfile.c: Arrange some things more orderly.
 
 2016-02-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/rcfile.c (parse_header_exp): Don't continue when something is
diff --git a/src/nano.h b/src/nano.h
index cef9167a..a2f6ee6d 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -246,14 +246,14 @@ typedef struct syntaxtype {
 	/* The list of headerlines that this syntax applies to. */
     regexlisttype *magics;
 	/* The list of libmagic results that this syntax applies to. */
-    colortype *color;
-	/* The colors used in this syntax. */
     char *linter;
-	/* The command to lint this type of file. */
+	/* The command with which to lint this type of file. */
     char *formatter;
-        /* Use this formatter command (for programming lang mainly) */
+        /* The formatting command (for programming languages mainly). */
+    colortype *color;
+	/* The colors and their regexes used in this syntax. */
     int nmultis;
-	/* How many multi-line strings this syntax has. */
+	/* How many multiline regex strings this syntax has. */
     struct syntaxtype *next;
 	/* Next syntax. */
 } syntaxtype;
diff --git a/src/rcfile.c b/src/rcfile.c
index ce770aa9..b1928264 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -333,15 +333,15 @@ void parse_syntax(char *ptr)
     }
 
     endsyntax->name = mallocstrcpy(NULL, nameptr);
-    endsyntax->color = NULL;
-    endcolor = NULL;
     endsyntax->extensions = NULL;
     endsyntax->headers = NULL;
     endsyntax->magics = NULL;
-    endsyntax->next = NULL;
-    endsyntax->nmultis = 0;
     endsyntax->linter = NULL;
     endsyntax->formatter = NULL;
+    endsyntax->color = NULL;
+    endcolor = NULL;
+    endsyntax->nmultis = 0;
+    endsyntax->next = NULL;
 
     opensyntax = TRUE;