]> git.wh0rd.org Git - nano.git/commitdiff
2009-01-28 Davide Pesavento <davidepesa@gmail.com>
authorChris Allegretta <chrisa@asty.org>
Wed, 28 Jan 2009 18:32:33 +0000 (18:32 +0000)
committerChris Allegretta <chrisa@asty.org>
Wed, 28 Jan 2009 18:32:33 +0000 (18:32 +0000)
        * doc/syntax/gentoo.nanorc: Updates from David and Mike Frysinger.

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

ChangeLog
doc/syntax/gentoo.nanorc

index e17e5816f4dbe33193daae1ab16a7b37d2108744..b787dae3e1194bef03111ce542014b3f7853c9cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-01-28 Davide Pesavento <davidepesa@gmail.com>
+       * doc/syntax/gentoo.nanorc: Updates from David and Mike Frysinger.
+
 2009-01-25 Chris Allegretta <chrisa@asty.org>
        * files.c (open_file), nanorc.c (parse_include): Don't get_full_path on 
          included rc files, due to it potentially impacting the ability
index 6e3470b8c3d61f9559989f21712c8267a1093808..8bafe2d67fdc871a4217b812adb48268de127b60 100644 (file)
@@ -2,26 +2,30 @@
 ##
 syntax "ebuild" "\.e(build|class)$"
 ## All the standard portage functions
-color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+color brightgreen "^src_(unpack|prepare|configure|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
 ## Highlight bash related syntax
 color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
+color green "\<(declare|eval|exec|let)\>"
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color green "-(e|d|f|r|g|u|w|x|L)\>"
+color green "-[edfgruwxL]\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 ## Highlight variables ... official portage ones in red, all others in bright red
 color brightred "\$\{?[a-zA-Z_0-9]+\}?"
-color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>"
-color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|RESTRICT|USERLAND)\>"
+color red "\<(S|D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|ROOT|WORKDIR)\>" "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>" "\<WANT_AUTO(CONF|MAKE)\>" "\<AT_M4DIR\>"
 ## Highlight portage commands
 color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
-color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon?|error|log|patch|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make))\>"
+color brightblue "\<built_with_use\>" "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(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 "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
-color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)"
+color brightblue "\<(|doc|ins|exe)into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 ## Highlight common commands used in ebuilds
-color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
+color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
 ## Highlight comments (doesnt work that well)
 color yellow "#.*$"
 ## Highlight strings (doesnt work that well)
@@ -31,17 +35,18 @@ color ,green "[[:space:]]+$"
 
 ## Here is an example for Portage control files
 ##
-syntax "/etc/portage" "\.(keywords|mask|unmask|use)$"
+syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$"
 ## Base text:
 color green "^.+$"
 ## Use flags:
 color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
 color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
-## Likely version numbers:
+## Likely version and slot numbers:
 color magenta "-[[:digit:]].*([[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
 ## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
-color white "[[:space:]][~-]?\*"
+color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc(-fbsd)?|x86(-fbsd)?)\>"
+color white "[[:space:]][*~-]?\*"
 ## Categories:
 color cyan "^[[:space:]]*.*/"
 ## Masking regulators: