Adding the 'extendsyntax' directive, and changing

two colours to be legible on a light background.

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

diff --git a/ChangeLog b/ChangeLog
index 2d2c15f597b56199953f4129d0747a890f90c575..9196aed61ae2c550f8908dc9e250f3d01fc60c82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2014-03-21  Benno Schulenberg  <bensberg@justemail.net>
        * src/chars.c (is_punct_mbchar, mbstrchr) - Elide a variable,
        thus making two ifs identical to six others.
+       * doc/syntax/nanorc.nanorc - Add the 'extendsyntax' directive,
+       and change two colours to be legible on a light background.
 
 2014-03-19  Benno Schulenberg  <bensberg@justemail.net>
        * doc/nanorc.sample.in - Document the changed whitespace defaults.

diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index 2899f7adb9d70a69988a827e7049148f6b719cfa..20a4225bf51f7a42a898d20c9ad885afcf86fe35 100644 (file)
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -2,17 +2,18 @@
 ##
 syntax "nanorc" "\.?nanorc$"
 ## Possible errors and parameters
-icolor brightwhite "^[[:space:]]*((un)?(bind|set)|include|syntax|i?color).*$"
+icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$"
 ## Keywords
 icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|locking|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|poslog|preserve|punct|quickblank|quiet|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>"
 icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]+[[:alpha:]]+[[:space:]]*$"
 icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]*$"
+icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|linter)[[:space:]]+.*$"
 icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter)\>"
 ## Colors
 icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
 icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
 ## Strings
-icolor white ""(\\.|[^"])*""
+icolor brightmagenta ""(\\.|[^"])*""
 ## Comments
 icolor brightblue "^[[:space:]]*#.*$"
 icolor cyan "^[[:space:]]*##.*$"