commit: 91de08b764593b7a7d4f60cae85f90763930e873
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 29 04:33:25 2014 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Nov 29 04:33:25 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=91de08b7
Revert "wrap some long lines"
This breaks some pattern matching (bug #531076).
---
syntax/ebuild.vim | 4 +---
syntax/gentoo-make-conf.vim | 25 ++++---------------------
2 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 3f7cc0c..9ea2c15 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -206,9 +206,7 @@ syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update
gnome2_pkg_postinst g
" EXPORT_FUNCTIONS
syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
-syn match EbuildExportFunctionsFuncE contained
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup
-
\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst
- \|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@<!/ skipwhite
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
+syn match EbuildExportFunctionsFuncE contained
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@<!/
skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
" Eclass documentation
syn match EclassDocumentation
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
contained
diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index fe48952..41ae65c 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -17,10 +17,7 @@ endif
runtime syntax/gentoo-common.vim
-syn cluster GentooMakeConfEC
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,
-
\GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,
-
\GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,
- \GentooMakeConfEMISCKE,GentooMakeConfEMISCN
+syn cluster GentooMakeConfEC
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,GentooMakeConfEMISCKE,GentooMakeConfEMISCN
syn region GentooMakeConfE start=/^/ end=/$/
contains=@GentooMakeConfEC,GentooMakeConfComment
" MISC {{{
@@ -34,22 +31,9 @@ syn match GentooMakeConfEMISCIX
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
" naughty
syn match GentooMakeConfEMISCN
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained
nextgroup=GentooMakeConfEMISCE skipwhite
" known but not handled specially
-syn match GentooMakeConfEMISCK
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY
-
\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND
-
\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR
-
\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR
-
\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS
-
\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI
-
\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE
-
\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES
-
\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES
-
\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF
-
\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD
-
\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES
- \|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS/ contained
nextgroup=GentooMakeConfEMISCE skipwhite
+syn match GentooMakeConfEMISCK
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_
STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES\|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS/
contained nextgroup=GentooMakeConfEMISCE skipwhite
" common eclass stuff
-syn match GentooMakeConfEMISCKE
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_ACTION\|BREAKME\|ECHANGELOG_USER
- \|CCACHE_SIZE\|CCACHE_DIR\|DISTCC_DIR/ contained
nextgroup=GentooMakeConfEMISCE skipwhite
+syn match GentooMakeConfEMISCKE
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_ACTION\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|DISTCC_DIR/
contained nextgroup=GentooMakeConfEMISCE skipwhite
hi def link GentooMakeConfEMISC Keyword
hi def link GentooMakeConfEMISCK Identifier
@@ -141,8 +125,7 @@ syn cluster GentooMakeConfECFLAGSIC
add=GentooMakeConfECFLAGSIB1,GentooMakeConfE
syn region GentooMakeConfECFLAGSV contained start=/"/ end=/"/
contains=@GentooMakeConfECFLAGSIC
syn match GentooMakeConfECFLAGSIB1
/-ffast-math\|-freduce-all-givs\|-mfpmath=sse,387\|-DNDEBUG\|-s\([a-zA-Z0-9\-\_]\)\@!\|-Wno\S\+\|x86.\?64\|-mvis/
contained
syn match GentooMakeConfECFLAGSIB2 /-[0o][123s]/ contained
-syn match GentooMakeConfECFLAGSIB3
/\%(-Os\|-fPIC\|-fpic\|-DPIC\)\%(\(=\%(k8\|opteron
-
\|athlon64\|athlon-fx\).*\)\@<=\|\(.*=\%(k8\|opteron\|athlon64\|athlon-fx\)\)\@=\)/
+syn match GentooMakeConfECFLAGSIB3
/\%(-Os\|-fPIC\|-fpic\|-DPIC\)\%(\(=\%(k8\|opteron\|athlon64\|athlon-fx\).*\)\@<=\|\(.*=\%(k8\|opteron\|athlon64\|athlon-fx\)\)\@=\)/
syn match GentooMakeConfECFLAGSIX /\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/
contained
syn region GentooMakeConfECFLAGSVNoQ contained start=/[^ "]/ end=/\s\|$/
contains=GentooMakeConfECFLAGSIX
