From: Benno Schulenberg Date: Mon, 24 Mar 2014 12:31:25 +0000 (+0000) Subject: EAPI=5 updates for gentoo.nanorc. Patch by Mike Frysinger. X-Git-Tag: v2.3.3~262 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b2a47a10908ead73e7c8b8aa25a5808b78162ea9;p=nano.git EAPI=5 updates for gentoo.nanorc. Patch by Mike Frysinger. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4668 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index eb798894..91637673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-24 Benno Schulenberg + * doc/syntax/gentoo.nanorc - Match more files, add a trailing + whitespace check, and EAPI=5 updates. Patch by Mike Frysinger. + 2014-03-23 Benno Schulenberg * src/rcfile.c (parse_keybinding, parse_unbinding) - Improve a debugging message, fix a translator comment, and tweak others. diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc index 15b247e7..96bd18a0 100644 --- a/doc/syntax/gentoo.nanorc +++ b/doc/syntax/gentoo.nanorc @@ -3,8 +3,8 @@ syntax "ebuild" "\.e(build|class)$" ## All the standard portage functions color brightgreen "(^|\" -color brightgreen "^pkg_(config|nofetch|pretend|setup|(pre|post)(inst|rm))\>" -color brightgreen "\" +color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>" +color brightgreen "\" ## Highlight bash related syntax color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>" color green "\<(declare|eval|exec|export|let|local)\>" @@ -14,9 +14,10 @@ color green "-(eq|ne|gt|lt|ge|le)\>" ## Highlight variables ... official portage ones in red, all others in bright red color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*" color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" -color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>" +color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[HPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>" color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>" -color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\" +color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>" +color red "\" color red "\" color red "\<(PATCHES|(HTML_)?DOCS)\>" "\" "\" ## Highlight portage commands @@ -25,9 +26,9 @@ color brightblue "\" "\" color brightblue "\" "\" color brightblue "\" "\" -color brightblue "\<(die|has|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>" +color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>" color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>" -color brightblue "\" "\" +color brightblue "\" "\" color brightblue "\" "\" color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>" color brightblue "\" @@ -43,7 +44,7 @@ color ,green "[[:space:]]+$" ## Here is an example for Portage control files. ## -syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$" +syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$" ## Base text: color green "^.+$" ## Use flags: @@ -61,3 +62,5 @@ color cyan "^[[:space:]]*.*/" color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)" ## Comments: color yellow "#.*$" +## Trailing space is bad! +color ,green "[[:space:]]+$"