From 42e75823b8fefa2c4d5de5cf05da787e3dfd1d92 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 21 Mar 2014 13:59:29 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 ++ doc/syntax/nanorc.nanorc | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d2c15f5..9196aed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2014-03-21 Benno Schulenberg * 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 * doc/nanorc.sample.in - Document the changed whitespace defaults. diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc index 2899f7ad..20a4225b 100644 --- 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:]]*##.*$"