diff options
| -rw-r--r-- | doc/gentoo-syntax.txt | 20 | ||||
| -rw-r--r-- | ftdetect/gentoo.vim | 10 | ||||
| -rw-r--r-- | ftplugin/gentoo-changelog.vim | 15 | ||||
| -rw-r--r-- | syntax/gentoo-changelog.vim | 52 |
4 files changed, 7 insertions, 90 deletions
diff --git a/doc/gentoo-syntax.txt b/doc/gentoo-syntax.txt index 854241f..8e68f7a 100644 --- a/doc/gentoo-syntax.txt +++ b/doc/gentoo-syntax.txt @@ -18,7 +18,6 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org> Common Syntax Rules |gentoo-common-syntax| Ebuild and Eclass Files |gentoo-ebuild-syntax| GLEP Files |gentoo-glep-syntax| - ChangeLogs |gentoo-changelog-syntax| conf.d Files |gentoo-conf.d-syntax| cron.d Files |gentoo-cron.d-syntax| env.d Files |gentoo-env.d-syntax| @@ -43,8 +42,8 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org> The gentoo-syntax package provides a collection of syntax, ftdetect, ftplugin and indent files to help Gentoo developers and users work - with ebuilds, eclasses, GLEPs, Gentoo style ChangeLogs, init.d / - conf.d / env.d / cron.d entries, /etc/portage/ files and so on. + with ebuilds, eclasses, GLEPs, init.d / conf.d / env.d / cron.d entries, + /etc/portage/ files and so on. Detection Specifics *gentoo-syntax-detection* @@ -56,9 +55,6 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org> the first line of the file starts with "GLEP: ". They are assigned the 'glep' filetype. - Gentoo ChangeLogs are detected by the 'ChangeLog' filename and a - copyright header on the second line. - init.d scripts are detected by being in /etc/init.d/ . They are also detected if they are under a files/ directory and include a '#!/sbin/runscript' header. @@ -79,8 +75,8 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org> Highlighting Specifics *gentoo-syntax-highlighting* - Syntax highlighting is provided for ebuild/eclass, GLEP files, - Gentoo ChangeLogs and init.d / conf.d / env.d / cron.d scripts. + Syntax highlighting is provided for ebuild/eclass, GLEP files and + init.d / conf.d / env.d / cron.d scripts. *gentoo-common-syntax* @@ -106,11 +102,6 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org> syntax file. Additional highlighting is available for the headers at the top of the file and for heading sections. - *gentoo-changelog-syntax* - - Syntax highlighting for Gentoo ChangeLogs is implemented from scratch - (some rules come from |gentoo-common-syntax|). - *gentoo-conf.d-syntax* Syntax highlighting for conf.d files is based upon the vim-provided @@ -183,8 +174,7 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org> the hyphen character is added as a valid keyword character (|'iskeyword'|). - For ebuilds, eclasses and ChangeLogs, UTF-8 is used for fileencoding - as per GLEP 31. + For ebuilds, eclasses, UTF-8 is used for fileencoding as per GLEP 31. Indent Specifics *gentoo-indent-settings* diff --git a/ftdetect/gentoo.vim b/ftdetect/gentoo.vim index b2ed1bd..d63d88c 100644 --- a/ftdetect/gentoo.vim +++ b/ftdetect/gentoo.vim @@ -4,8 +4,8 @@ " Copyright: Copyright (c) 2004-2005 Ciaran McCreesh " Licence: You may redistribute this under the same terms as Vim itself " -" This sets up syntax highlighting for Gentoo ebuilds, eclasses, GLEPs and -" Gentoo style ChangeLogs. +" This sets up syntax highlighting for Gentoo ebuilds, eclasses, GLEPs, init.d / +" conf.d / env.d / cron.d entries, /etc/portage/ files and so on. " if &compatible || v:version < 603 @@ -23,12 +23,6 @@ au BufNewFile,BufRead *.txt,*.rst \ set filetype=glep | \ endif -" ChangeLogs -au BufNewFile,BufRead ChangeLog* - \ if (getline(2) =~? "^# Copyright \\d\\+-\\d\\+ Gentoo Foundation") | - \ set filetype=gentoo-changelog | - \ endif - " /etc/init.d/ scripts au BufNewFile,BufRead /etc/init.d/* \ set filetype=gentoo-init-d.sh | diff --git a/ftplugin/gentoo-changelog.vim b/ftplugin/gentoo-changelog.vim deleted file mode 100644 index 1e1ca66..0000000 --- a/ftplugin/gentoo-changelog.vim +++ /dev/null @@ -1,15 +0,0 @@ -" Vim filetype plugin file -" Language: Gentoo ChangeLogs -" Author: Ciaran McCreesh <ciaranm@gentoo.org> -" Copyright: Copyright (c) 2004-2005 Ciaran McCreesh -" Licence: You may redistribute this under the same terms as Vim itself -" -" Sets up settings for Gentoo ChangeLogs as per GLEP 31. -" - -if &compatible || v:version < 603 - finish -endif - -" GLEP 31 settings -setlocal fileencoding=utf-8 diff --git a/syntax/gentoo-changelog.vim b/syntax/gentoo-changelog.vim deleted file mode 100644 index 4440861..0000000 --- a/syntax/gentoo-changelog.vim +++ /dev/null @@ -1,52 +0,0 @@ -" Vim syntax file -" Language: Gentoo ChangeLogs -" Author: Ciaran McCreesh <ciaranm@gentoo.org> -" Copyright: Copyright (c) 2004-2005 Ciaran McCreesh -" Licence: You may redistribute this under the same terms as Vim itself -" -" Syntax highlighting for Gentoo ChangeLogs. Needs vim 6.3 or later. -" - -if &compatible || v:version < 603 - finish -endif - -if exists("b:current_syntax") - finish -endif - -runtime syntax/gentoo-common.vim - -" Releases -syn region GentooChangeLogRelease start=/^\*/ end=/$/ contains=GentooChangeLogReleaseDate -syn match GentooChangeLogReleaseDate contained /(\d\d\s\w\+\s\d\{4\})/ - -" Entries -syn region GentooChangeLogEntry start=/^\s\+/ end=/\n\n/ - \ contains=GentooChangeLogEntryDate,GentooBug -syn region GentooChangeLogEntryDate contained start=/\d\?\d\s\w\+\s\d\{4\}/ end=/;/ - \ nextgroup=GentooChangeLogEntryAuthor,GentooChangeLogEntryEmail skipwhite skipnl -syn region GentooChangeLogEntryAuthor contained start=/\S/ end=/\( <\)\@=/ - \ nextgroup=GentooChangeLogEntryEmail skipwhite skipnl -syn match GentooChangeLogEntryEmail contained /<\?[a-zA-Z0-9\.\-\_]\+@[a-zA-Z0-9\.\-\_]\+>\?/ - \ nextgroup=GentooChangeLogFiles skipwhite skipnl -syn region GentooChangeLogFiles contained start=/\(\S\)\@=/ end=/:/ - \ contains=GentooChangeLogAddFile,GentooChangeLogDelFile,GentooChangeLogModFile - -" Add / delete / changed files -syn region GentooChangeLogAddFile contained start=/+/ end=/\([,:]\)\@=/ -syn region GentooChangeLogDelFile contained start=/-/ end=/\([,:]\)\@=/ -syn region GentooChangeLogModFile contained start=/[a-zA-Z0-9]/ end=/\([,:]\)\@=/ - -" Colours -hi def link GentooChangeLogEntryDate Number -hi def link GentooChangeLogEntryAuthor String -hi def link GentooChangeLogEntryEmail Special -hi def link GentooChangeLogModFile Identifier -hi def link GentooChangeLogAddFile DiffAdd -hi def link GentooChangeLogDelFile DiffDelete - -hi def link GentooChangeLogRelease Title -hi def link GentooChangeLogReleaseDate Number - -let b:current_syntax = "gentoo-changelog" |