commit: 441b29c072820e77106e0239de3b5687486b6341
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 2 00:27:24 2014 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Nov 2 00:27:24 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=441b29c0
whitespace consistency cleanup
---
ftdetect/gentoo.vim | 3 +--
ftplugin/ebuild.vim | 1 -
ftplugin/gentoo-changelog.vim | 1 -
ftplugin/gentoo-metadata.vim | 1 -
indent/ebuild.vim | 3 +--
indent/gentoo-metadata.vim | 3 +--
plugin/newinitd.vim | 2 +-
plugin/newmetadata.vim | 4 ++--
syntax/ebuild.vim | 25 ++++++++++++-------------
syntax/gentoo-changelog.vim | 13 ++++++-------
syntax/gentoo-make-conf.vim | 2 +-
syntax/gentoo-metadata.vim | 1 -
syntax/gentoo-mirrors.vim | 9 ++++-----
syntax/gentoo-package-keywords.vim | 9 ++++-----
syntax/gentoo-package-license.vim | 9 ++++-----
syntax/gentoo-package-mask.vim | 5 ++---
syntax/gentoo-package-properties.vim | 8 ++++----
syntax/gentoo-package-use.vim | 11 +++++------
syntax/gentoo-use-desc.vim | 5 ++---
syntax/glep.vim | 3 +--
syntax/guidexml.vim | 1 -
21 files changed, 51 insertions(+), 68 deletions(-)
diff --git a/ftdetect/gentoo.vim b/ftdetect/gentoo.vim
index 1d27fc4..ba425fe 100644
--- a/ftdetect/gentoo.vim
+++ b/ftdetect/gentoo.vim
@@ -98,5 +98,4 @@ au BufNewFile,BufRead *.xml
\ getline(8) =~ "<!DOCTYPE
\\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
\ getline(9) =~ "<!DOCTYPE
\\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " |
\ set filetype=guidexml |
- \ endif
-
+ \ endif
diff --git a/ftplugin/ebuild.vim b/ftplugin/ebuild.vim
index fbb8eb7..356c669 100644
--- a/ftplugin/ebuild.vim
+++ b/ftplugin/ebuild.vim
@@ -25,4 +25,3 @@ setlocal noexpandtab
" GLEP 31 settings
setlocal fileencoding=utf-8
-
diff --git a/ftplugin/gentoo-changelog.vim b/ftplugin/gentoo-changelog.vim
index 10f5009..1e1ca66 100644
--- a/ftplugin/gentoo-changelog.vim
+++ b/ftplugin/gentoo-changelog.vim
@@ -13,4 +13,3 @@ endif
" GLEP 31 settings
setlocal fileencoding=utf-8
-
diff --git a/ftplugin/gentoo-metadata.vim b/ftplugin/gentoo-metadata.vim
index 7debcce..b0de35d 100644
--- a/ftplugin/gentoo-metadata.vim
+++ b/ftplugin/gentoo-metadata.vim
@@ -20,4 +20,3 @@ setlocal noexpandtab
" GLEP 31 settings
setlocal fileencoding=utf-8
-
diff --git a/indent/ebuild.vim b/indent/ebuild.vim
index 0630068..a2f9316 100644
--- a/indent/ebuild.vim
+++ b/indent/ebuild.vim
@@ -14,11 +14,10 @@ endif
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
- finish
+ finish
endif
runtime! indent/sh.vim
let b:did_indent = 1
-
" vim: set sts=2 sw=2:
diff --git a/indent/gentoo-metadata.vim b/indent/gentoo-metadata.vim
index c8776b0..377c7a3 100644
--- a/indent/gentoo-metadata.vim
+++ b/indent/gentoo-metadata.vim
@@ -13,11 +13,10 @@ endif
" Only load this indent file when no other was loaded.
if exists("b:did_indent")
- finish
+ finish
endif
runtime! indent/xml.vim
let b:did_indent = 1
-
" vim: set sts=2 sw=2:
diff --git a/plugin/newinitd.vim b/plugin/newinitd.vim
index 3f47666..8195285 100644
--- a/plugin/newinitd.vim
+++ b/plugin/newinitd.vim
@@ -38,7 +38,7 @@ com! -nargs=0 NewInitd call <SID>MakeNewInitd() | set
filetype=gentoo-init-d
augroup NewInitd
au!
autocmd BufNewFile {/*/files/*.{rc*,init*},/etc/init.d/*}
- \ call <SID>MakeNewInitd() | set filetype=gentoo-init-d
+ \ call <SID>MakeNewInitd() | set filetype=gentoo-init-d
augroup END
" vim: set et foldmethod=marker : "
diff --git a/plugin/newmetadata.vim b/plugin/newmetadata.vim
index b721341..aa08bc8 100644
--- a/plugin/newmetadata.vim
+++ b/plugin/newmetadata.vim
@@ -79,7 +79,7 @@ fun! <SID>MakeNewMetadata()
if l:name != ""
put ='<name>' . l:name . '</name>'
endif
- put ='</maintainer>'
+ put ='</maintainer>'
endif
put ='<longdescription lang=\"en\">'
put ='</longdescription>'
@@ -104,7 +104,7 @@ com! -nargs=0 NewMetadata call <SID>MakeNewMetadata()
augroup NewMetadata
au!
autocmd BufNewFile metadata.xml
- \ call <SID>MakeNewMetadata()
+ \ call <SID>MakeNewMetadata()
augroup END
" vim: set et foldmethod=marker : "
diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index c85beef..3f7cc0c 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -291,21 +291,21 @@ hi def link EbuildVimDocKeyword Identifier
hi def link EbuildMultilibKeyword Identifier
hi def link Ebuild64bitKeyword Identifier
hi def link EbuildCronKeyword Identifier
-hi def link EbuildGamesKeyword Identifier
+hi def link EbuildGamesKeyword Identifier
hi def link EbuildToolFuncsKeyword Identifier
-hi def link EbuildSVNKeyword Identifier
-hi def link EbuildAltKeyword Identifier
-hi def link EbuildRPMKeyword Identifier
-hi def link EbuildPythonKeyword Identifier
-hi def link EbuildCheckKernelKeyword Identifier
-hi def link EbuildPerlModuleKeyword Identifier
-hi def link EbuildDistutilsKeyword Identifier
+hi def link EbuildSVNKeyword Identifier
+hi def link EbuildAltKeyword Identifier
+hi def link EbuildRPMKeyword Identifier
+hi def link EbuildPythonKeyword Identifier
+hi def link EbuildCheckKernelKeyword Identifier
+hi def link EbuildPerlModuleKeyword Identifier
+hi def link EbuildDistutilsKeyword Identifier
hi def link EbuildDependApacheKeyword Identifier
hi def link EbuildApacheModuleKeyword Identifier
-hi def link EbuildPamKeyword Identifier
-hi def link EbuildVirtualXKeyword Identifier
-hi def link EbuildGnome2Keyword Identifier
-hi def link EbuildAutoKeyword Identifier
+hi def link EbuildPamKeyword Identifier
+hi def link EbuildVirtualXKeyword Identifier
+hi def link EbuildGnome2Keyword Identifier
+hi def link EbuildAutoKeyword Identifier
hi def link EclassDocumentation Identifier
@@ -318,4 +318,3 @@ hi def link EbuildExportFunctionsFunc Identifier
hi def link EbuildExportFunctionsFuncE Error
let b:current_syntax = "ebuild"
-
diff --git a/syntax/gentoo-changelog.vim b/syntax/gentoo-changelog.vim
index f7f0f3a..4440861 100644
--- a/syntax/gentoo-changelog.vim
+++ b/syntax/gentoo-changelog.vim
@@ -12,7 +12,7 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
@@ -23,15 +23,15 @@ syn match GentooChangeLogReleaseDate contained
/(\d\d\s\w\+\s\d\{4\})/
" Entries
syn region GentooChangeLogEntry start=/^\s\+/ end=/\n\n/
- \ contains=GentooChangeLogEntryDate,GentooBug
+ \ contains=GentooChangeLogEntryDate,GentooBug
syn region GentooChangeLogEntryDate contained start=/\d\?\d\s\w\+\s\d\{4\}/
end=/;/
- \ nextgroup=GentooChangeLogEntryAuthor,GentooChangeLogEntryEmail
skipwhite skipnl
+ \ nextgroup=GentooChangeLogEntryAuthor,GentooChangeLogEntryEmail skipwhite
skipnl
syn region GentooChangeLogEntryAuthor contained start=/\S/ end=/\( <\)\@=/
- \ nextgroup=GentooChangeLogEntryEmail skipwhite skipnl
+ \ nextgroup=GentooChangeLogEntryEmail skipwhite skipnl
syn match GentooChangeLogEntryEmail contained
/<\?[a-zA-Z0-9\.\-\_]\+@[a-zA-Z0-9\.\-\_]\+>\?/
- \ nextgroup=GentooChangeLogFiles skipwhite skipnl
+ \ nextgroup=GentooChangeLogFiles skipwhite skipnl
syn region GentooChangeLogFiles contained start=/\(\S\)\@=/ end=/:/
- \
contains=GentooChangeLogAddFile,GentooChangeLogDelFile,GentooChangeLogModFile
+ \
contains=GentooChangeLogAddFile,GentooChangeLogDelFile,GentooChangeLogModFile
" Add / delete / changed files
syn region GentooChangeLogAddFile contained start=/+/ end=/\([,:]\)\@=/
@@ -50,4 +50,3 @@ hi def link GentooChangeLogRelease Title
hi def link GentooChangeLogReleaseDate Number
let b:current_syntax = "gentoo-changelog"
-
diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 4d3c2b3..fe48952 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -12,7 +12,7 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
diff --git a/syntax/gentoo-metadata.vim b/syntax/gentoo-metadata.vim
index 0a868e1..55e359e 100644
--- a/syntax/gentoo-metadata.vim
+++ b/syntax/gentoo-metadata.vim
@@ -40,4 +40,3 @@ syn match metadataElement contained 'pkgmetadata'
hi def link metadataElement Keyword
let b:current_syntax = "gentoo-metadata"
-
diff --git a/syntax/gentoo-mirrors.vim b/syntax/gentoo-mirrors.vim
index cdbc03f..d5b09f6 100644
--- a/syntax/gentoo-mirrors.vim
+++ b/syntax/gentoo-mirrors.vim
@@ -13,21 +13,21 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
syn region GentooMirrorsComment start=/#/ end=/$/
- \ contains=GentooMirrorsEmail,GentooMirrorsDate,GentooBug
+ \ contains=GentooMirrorsEmail,GentooMirrorsDate,GentooBug
syn match GentooMirrorsEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooMirrorsDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
syn match GentooMirrorsAtom /^[^# \t]\+/
- \ nextgroup=GentooMirrorsUrl skipwhite
+ \ nextgroup=GentooMirrorsUrl skipwhite
syn region GentooMirrorsUrl contained start=/\(http\|ftp\):\/\//
end=/\(\s\)\@=\|$/
- \ nextgroup=GentooMirrorsUrl skipwhite
+ \ nextgroup=GentooMirrorsUrl skipwhite
hi def link GentooMirrorsComment Comment
hi def link GentooMirrorsEmail Special
@@ -36,4 +36,3 @@ hi def link GentooMirrorsAtom Identifier
hi def link GentooMirrorsUrl String
let b:current_syntax = "gentoo-mirrors"
-
diff --git a/syntax/gentoo-package-keywords.vim
b/syntax/gentoo-package-keywords.vim
index 18888ce..190954f 100644
--- a/syntax/gentoo-package-keywords.vim
+++ b/syntax/gentoo-package-keywords.vim
@@ -13,21 +13,21 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
syn region GentooPackageKeywordsComment start=/#/ end=/$/
- \
contains=GentooPackageKeywordsEmail,GentooPackageKeywordsDate,GentooBug
+ \ contains=GentooPackageKeywordsEmail,GentooPackageKeywordsDate,GentooBug
syn match GentooPackageKeywordsEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooPackageKeywordsDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
syn match GentooPackageKeywordsAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackageKeywordsKeyword skipwhite
+ \ nextgroup=GentooPackageKeywordsKeyword skipwhite
syn match GentooPackageKeywordsKeyword contained
/-\?[-~]\?\([a-z0-9\-]\+\|\*\)/
- \ nextgroup=GentooPackageKeywordsKeyword skipwhite
+ \ nextgroup=GentooPackageKeywordsKeyword skipwhite
hi def link GentooPackageKeywordsComment Comment
hi def link GentooPackageKeywordsEmail Special
@@ -36,4 +36,3 @@ hi def link GentooPackageKeywordsAtom Identifier
hi def link GentooPackageKeywordsKeyword Keyword
let b:current_syntax = "gentoo-package-keywords"
-
diff --git a/syntax/gentoo-package-license.vim
b/syntax/gentoo-package-license.vim
index 9477f8f..824d70a 100644
--- a/syntax/gentoo-package-license.vim
+++ b/syntax/gentoo-package-license.vim
@@ -13,21 +13,21 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
syn region GentooPackageLicenseComment start=/#/ end=/$/
- \
contains=GentooPackageLicenseEmail,GentooPackageLicenseDate,GentooBug
+ \ contains=GentooPackageLicenseEmail,GentooPackageLicenseDate,GentooBug
syn match GentooPackageLicenseEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooPackageLicenseDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
syn match GentooPackageLicenseAtom /^[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackageLicenseLicense skipwhite
+ \ nextgroup=GentooPackageLicenseLicense skipwhite
syn match GentooPackageLicenseLicense contained
/-\?@\?\([a-zA-Z0-9\-_.+]\+\|\*\)/
- \ nextgroup=GentooPackageLicenseLicense skipwhite
+ \ nextgroup=GentooPackageLicenseLicense skipwhite
hi def link GentooPackageLicenseComment Comment
hi def link GentooPackageLicenseEmail Special
@@ -36,4 +36,3 @@ hi def link GentooPackageLicenseAtom Identifier
hi def link GentooPackageLicenseLicense Keyword
let b:current_syntax = "gentoo-package-license"
-
diff --git a/syntax/gentoo-package-mask.vim b/syntax/gentoo-package-mask.vim
index 6936070..c36b45d 100644
--- a/syntax/gentoo-package-mask.vim
+++ b/syntax/gentoo-package-mask.vim
@@ -13,14 +13,14 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
" Header
syn region GentooPackageMaskComment start=/#/ end=/$/
- \ contains=GentooPackageMaskEmail,GentooPackageMaskDate,GentooBug
+ \ contains=GentooPackageMaskEmail,GentooPackageMaskDate,GentooBug
syn match GentooPackageMaskEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooPackageMaskDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
@@ -33,4 +33,3 @@ hi def link GentooPackageMaskDate Number
hi def link GentooPackageMaskAtom Identifier
let b:current_syntax = "gentoo-package-mask"
-
diff --git a/syntax/gentoo-package-properties.vim
b/syntax/gentoo-package-properties.vim
index e526c8e..8609491 100644
--- a/syntax/gentoo-package-properties.vim
+++ b/syntax/gentoo-package-properties.vim
@@ -13,21 +13,21 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
syn region GentooPackagePropertiesComment start=/#/ end=/$/
- \
contains=GentooPackagePropertiesEmail,GentooPackagePropertiesDate,GentooBug
+ \
contains=GentooPackagePropertiesEmail,GentooPackagePropertiesDate,GentooBug
syn match GentooPackagePropertiesEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooPackagePropertiesDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
syn match GentooPackagePropertiesAtom /^[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackagePropertiesProperty skipwhite
+ \ nextgroup=GentooPackagePropertiesProperty skipwhite
syn match GentooPackagePropertiesProperty contained
/-\?\([a-zA-Z0-9\-_]\+\|\*\)/
- \ nextgroup=GentooPackagePropertiesProperty skipwhite
+ \ nextgroup=GentooPackagePropertiesProperty skipwhite
hi def link GentooPackagePropertiesComment Comment
hi def link GentooPackagePropertiesEmail Special
diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index a61466b..d5c23e6 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -13,23 +13,23 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
syn region GentooPackageUseComment start=/#/ end=/$/
- \ contains=GentooPackageUseEmail,GentooPackageUseDate,GentooBug
+ \ contains=GentooPackageUseEmail,GentooPackageUseDate,GentooBug
syn match GentooPackageUseEmail contained
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
syn match GentooPackageUseDate contained
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
syn match GentooPackageUseAtom /^[^ \t\n#]\+\S\+\/\S\+/
- \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse skipwhite
+ \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse skipwhite
syn match GentooPackageUseUse contained /[a-zA-Z0-9][a-zA-Z0-9\-_]*/
- \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse skipwhite
+ \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse skipwhite
syn match GentooPackageUseUnuse contained /-[a-zA-Z0-9][a-zA-Z0-9\-_]*/
- \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse skipwhite
+ \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse skipwhite
hi def link GentooPackageUseComment Comment
hi def link GentooPackageUseEmail Special
@@ -39,4 +39,3 @@ hi def link GentooPackageUseUse Special
hi def link GentooPackageUseUnuse Keyword
let b:current_syntax = "gentoo-package-use"
-
diff --git a/syntax/gentoo-use-desc.vim b/syntax/gentoo-use-desc.vim
index ed641c0..ec4a48b 100644
--- a/syntax/gentoo-use-desc.vim
+++ b/syntax/gentoo-use-desc.vim
@@ -13,13 +13,13 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime syntax/gentoo-common.vim
syn region GentooUseDescComment start=/#/ end=/$/
- \ contains=GentooBug
+ \ contains=GentooBug
syn match GentooUseDescPackage
/^\(#\)\@!\([a-zA-Z0-9\-\_+\.]\+\/[a-zA-Z0-9\-\_+]\+\)\?/
nextgroup=GentooUseDescColon,GentooUseDescFlag skipwhite
syn match GentooUseDescColon /:/ contained nextgroup=GentooUseDescFlag
@@ -33,4 +33,3 @@ hi def link GentooUseDescFlag Identifier
hi def link GentooUseDescDesc String
let b:current_syntax = "gentoo-package-keywords"
-
diff --git a/syntax/glep.vim b/syntax/glep.vim
index 021e02c..cb2b1e7 100644
--- a/syntax/glep.vim
+++ b/syntax/glep.vim
@@ -13,7 +13,7 @@ if &compatible || v:version < 603
endif
if exists("b:current_syntax")
- finish
+ finish
endif
runtime! syntax/rst.vim
@@ -58,4 +58,3 @@ hi link glepHeaderCVSVar PreProc
hi link glepTODO Todo
let b:current_syntax = "glep"
-
diff --git a/syntax/guidexml.vim b/syntax/guidexml.vim
index 18289a8..9750b0c 100644
--- a/syntax/guidexml.vim
+++ b/syntax/guidexml.vim
@@ -46,4 +46,3 @@ hi def link guidexmlElement Keyword
hi def link guidexmlAttr Keyword
let b:current_syntax = "guidexml"
-
