diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/ftdetect/paludis.vim | 4 | ||||
| -rw-r--r-- | vim/syntax/Makefile.am | 2 | ||||
| -rw-r--r-- | vim/syntax/paludis-environment-conf.vim | 53 | ||||
| -rw-r--r-- | vim/syntax/paludis-general-conf.vim | 53 |
4 files changed, 56 insertions, 56 deletions
diff --git a/vim/ftdetect/paludis.vim b/vim/ftdetect/paludis.vim index 9c430ff79..3db4bdd32 100644 --- a/vim/ftdetect/paludis.vim +++ b/vim/ftdetect/paludis.vim @@ -11,8 +11,8 @@ if &compatible || v:version < 700 finish endif -au BufNewFile,BufRead environment.conf - \ set filetype=paludis-environment-conf +au BufNewFile,BufRead general.conf + \ set filetype=paludis-general-conf au BufNewFile,BufRead keywords.conf \ set filetype=paludis-keywords-conf diff --git a/vim/syntax/Makefile.am b/vim/syntax/Makefile.am index ee7314bc2..22e2d9498 100644 --- a/vim/syntax/Makefile.am +++ b/vim/syntax/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = AUTOMAKE_OPTIONS = 1.11 parallel-tests vimscripts = \ - paludis-environment-conf.vim \ + paludis-general-conf.vim \ paludis-keywords-conf.vim \ paludis-licenses-conf.vim \ paludis-mirrors-conf.vim \ diff --git a/vim/syntax/paludis-environment-conf.vim b/vim/syntax/paludis-environment-conf.vim deleted file mode 100644 index 6318746a4..000000000 --- a/vim/syntax/paludis-environment-conf.vim +++ /dev/null @@ -1,53 +0,0 @@ -" Vim syntax file -" Language: Paludis environment.conf files -" Author: Ciaran McCreesh -" Copyright: Copyright (c) 2007, 2008 Ciaran McCreesh -" Licence: You may redistribute this under the same terms as Vim itself -" -" Syntax highlighting for Paludis environment.conf files. -" - -if &compatible || v:version < 700 - finish -endif - -if exists("b:current_syntax") - finish -endif - -syn region PaludisEnvironmentConfComment start=/^\s*#/ end=/$/ - -syn region PaludisEnvironmentConfKey start=/^\(\s*[^#]\)\@=/ end=/=\@=/ - \ contains=PaludisEnvironmentConfKnownKey - -syn match PaludisEnvironmentConfEquals /=/ skipwhite - \ nextgroup=PaludisEnvironmentConfValue - -syn region PaludisEnvironmentConfValue contained start=// end=/$/ - \ contains=PaludisEnvironmentConfString,PaludisEnvironmentConfUnquoted, - \ PaludisEnvironmentConfContinuation,PaludisEnvironmentConfVariable - \ skipwhite - -syn match PaludisEnvironmentConfContinuation contained /\\$/ - \ skipnl - -syn match PaludisEnvironmentConfUnquoted contained /[^ \t$"'\\]\+/ skipwhite - -syn region PaludisEnvironmentConfString contained start=/"/ end=/"/ - \ contains=PaludisEnvironmentConfVariable - \ skipwhite - -syn keyword PaludisEnvironmentConfKnownKey contained - \ reduced_username portage_compatible distribution world - -syn match PaludisEnvironmentConfVariable contained /\$\({[^}]\+}\|[a-zA-Z0-9_]\+\)/ skipwhite - -hi def link PaludisEnvironmentConfKnownKey Keyword -hi def link PaludisEnvironmentConfString String -hi def link PaludisEnvironmentConfUnquoted Constant -hi def link PaludisEnvironmentConfVariable Identifier -hi def link PaludisEnvironmentConfContinuation Preproc -hi def link PaludisEnvironmentConfComment Comment - -let b:current_syntax = "paludis-environment-conf" - diff --git a/vim/syntax/paludis-general-conf.vim b/vim/syntax/paludis-general-conf.vim new file mode 100644 index 000000000..537f682de --- /dev/null +++ b/vim/syntax/paludis-general-conf.vim @@ -0,0 +1,53 @@ +" Vim syntax file +" Language: Paludis general.conf files +" Author: Ciaran McCreesh +" Copyright: Copyright (c) 2007, 2008, 2010 Ciaran McCreesh +" Licence: You may redistribute this under the same terms as Vim itself +" +" Syntax highlighting for Paludis general.conf files. +" + +if &compatible || v:version < 700 + finish +endif + +if exists("b:current_syntax") + finish +endif + +syn region PaludisGeneralConfComment start=/^\s*#/ end=/$/ + +syn region PaludisGeneralConfKey start=/^\(\s*[^#]\)\@=/ end=/=\@=/ + \ contains=PaludisGeneralConfKnownKey + +syn match PaludisGeneralConfEquals /=/ skipwhite + \ nextgroup=PaludisGeneralConfValue + +syn region PaludisGeneralConfValue contained start=// end=/$/ + \ contains=PaludisGeneralConfString,PaludisGeneralConfUnquoted, + \ PaludisGeneralConfContinuation,PaludisGeneralConfVariable + \ skipwhite + +syn match PaludisGeneralConfContinuation contained /\\$/ + \ skipnl + +syn match PaludisGeneralConfUnquoted contained /[^ \t$"'\\]\+/ skipwhite + +syn region PaludisGeneralConfString contained start=/"/ end=/"/ + \ contains=PaludisGeneralConfVariable + \ skipwhite + +syn keyword PaludisGeneralConfKnownKey contained + \ reduced_username portage_compatible distribution world + +syn match PaludisGeneralConfVariable contained /\$\({[^}]\+}\|[a-zA-Z0-9_]\+\)/ skipwhite + +hi def link PaludisGeneralConfKnownKey Keyword +hi def link PaludisGeneralConfString String +hi def link PaludisGeneralConfUnquoted Constant +hi def link PaludisGeneralConfVariable Identifier +hi def link PaludisGeneralConfContinuation Preproc +hi def link PaludisGeneralConfComment Comment + +let b:current_syntax = "paludis-general-conf" + |