Adjusting a comment, and being clearer about when to break.

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

diff --git a/ChangeLog b/ChangeLog
index e5cc02275bd7e7ab82f4ee7a659d1b4a39b53f54..5c344eb1bb3a8f3a0ce7b90f107a916b9b15c9d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2014-05-15  Benno Schulenberg  <bensberg@justemail.net>
        * doc/syntax/c.nanorc: Improve the magic regex, plus tweaks.
+       * src/color.c (color_update): Adjust comment, and be clear.
 
 2014-05-14  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (edit_draw): Poke a non-breaking space into the last

diff --git a/src/color.c b/src/color.c
index 6e807c425492ad039e671ee4e44ede103bc983cb..82febc07735c41fdaaf4bf8dde6f5cefbc517e4b 100644 (file)
--- a/src/color.c
+++ b/src/color.c
@@ -188,7 +188,7 @@ void color_update(void)
 
     /* If we didn't specify a syntax override string, or if we did and
      * there was no syntax by that name, get the syntax based on the
-     * file extension, then try magic, and then look in the header. */
+     * file extension, then try the headerline, and then try magic. */
     if (openfile->colorstrings == NULL) {
        for (tmpsyntax = syntaxes; tmpsyntax != NULL;
                tmpsyntax = tmpsyntax->next) {
@@ -310,7 +310,7 @@ void color_update(void)
                    if (not_compiled)
                        nfreeregex(&e->ext);
                }
-               if (openfile->syntax)
+               if (openfile->syntax != NULL)
                    break;
            }
            if (stat(openfile->filename, &fileinfo) == 0)