From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:06:44 +0200 Subject: vim-patch:89bcfda6834a Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 --- runtime/syntax/debcontrol.vim | 59 ++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) (limited to 'runtime/syntax/debcontrol.vim') diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim index 4fb53a55ca..4d354c4bd2 100644 --- a/runtime/syntax/debcontrol.vim +++ b/runtime/syntax/debcontrol.vim @@ -7,9 +7,7 @@ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim " Standard syntax initialization -if version < 600 - syntax clear -elseif exists("b:current_syntax") +if exists("b:current_syntax") finish endif @@ -86,37 +84,30 @@ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Inde syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell " Associate our matches and regions with pretty colours -if version >= 508 || !exists("did_debcontrol_syn_inits") - if version < 508 - let did_debcontrol_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink debcontrolKey Keyword - HiLink debcontrolField Normal - HiLink debcontrolStrictField Error - HiLink debcontrolDeprecatedKey Error - HiLink debcontrolMultiField Normal - HiLink debcontrolArchitecture Normal - HiLink debcontrolMultiArch Normal - HiLink debcontrolName Normal - HiLink debcontrolPriority Normal - HiLink debcontrolSection Normal - HiLink debcontrolPackageType Normal - HiLink debcontrolVariable Identifier - HiLink debcontrolEmail Identifier - HiLink debcontrolVcsSvn Identifier - HiLink debcontrolVcsCvs Identifier - HiLink debcontrolVcsGit Identifier - HiLink debcontrolHTTPUrl Identifier - HiLink debcontrolDmUpload Identifier - HiLink debcontrolComment Comment - HiLink debcontrolElse Special - - delcommand HiLink -endif +command -nargs=+ HiLink hi def link + +HiLink debcontrolKey Keyword +HiLink debcontrolField Normal +HiLink debcontrolStrictField Error +HiLink debcontrolDeprecatedKey Error +HiLink debcontrolMultiField Normal +HiLink debcontrolArchitecture Normal +HiLink debcontrolMultiArch Normal +HiLink debcontrolName Normal +HiLink debcontrolPriority Normal +HiLink debcontrolSection Normal +HiLink debcontrolPackageType Normal +HiLink debcontrolVariable Identifier +HiLink debcontrolEmail Identifier +HiLink debcontrolVcsSvn Identifier +HiLink debcontrolVcsCvs Identifier +HiLink debcontrolVcsGit Identifier +HiLink debcontrolHTTPUrl Identifier +HiLink debcontrolDmUpload Identifier +HiLink debcontrolComment Comment +HiLink debcontrolElse Special + +delcommand HiLink let b:current_syntax = "debcontrol" -- cgit From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:14:34 +0200 Subject: vim-patch:f37506f60f87 Updated runtime files. Remove HiLink commands. https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c --- runtime/syntax/debcontrol.vim | 48 ++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 26 deletions(-) (limited to 'runtime/syntax/debcontrol.vim') diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim index 4d354c4bd2..b52c496c95 100644 --- a/runtime/syntax/debcontrol.vim +++ b/runtime/syntax/debcontrol.vim @@ -3,7 +3,7 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs " Wichert Akkerman -" Last Change: 2015 Oct 24 +" Last Change: 2016 Aug 30 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim " Standard syntax initialization @@ -26,7 +26,7 @@ syn match debControlSpace " " let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)' let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386' - \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips\|powerpcspe\|powerpc\|ppc64el' + \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips64el\|mips\|powerpcspe\|powerpc\|ppc64el' \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)' let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386' @@ -84,30 +84,26 @@ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Inde syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell " Associate our matches and regions with pretty colours -command -nargs=+ HiLink hi def link - -HiLink debcontrolKey Keyword -HiLink debcontrolField Normal -HiLink debcontrolStrictField Error -HiLink debcontrolDeprecatedKey Error -HiLink debcontrolMultiField Normal -HiLink debcontrolArchitecture Normal -HiLink debcontrolMultiArch Normal -HiLink debcontrolName Normal -HiLink debcontrolPriority Normal -HiLink debcontrolSection Normal -HiLink debcontrolPackageType Normal -HiLink debcontrolVariable Identifier -HiLink debcontrolEmail Identifier -HiLink debcontrolVcsSvn Identifier -HiLink debcontrolVcsCvs Identifier -HiLink debcontrolVcsGit Identifier -HiLink debcontrolHTTPUrl Identifier -HiLink debcontrolDmUpload Identifier -HiLink debcontrolComment Comment -HiLink debcontrolElse Special - -delcommand HiLink +hi def link debcontrolKey Keyword +hi def link debcontrolField Normal +hi def link debcontrolStrictField Error +hi def link debcontrolDeprecatedKey Error +hi def link debcontrolMultiField Normal +hi def link debcontrolArchitecture Normal +hi def link debcontrolMultiArch Normal +hi def link debcontrolName Normal +hi def link debcontrolPriority Normal +hi def link debcontrolSection Normal +hi def link debcontrolPackageType Normal +hi def link debcontrolVariable Identifier +hi def link debcontrolEmail Identifier +hi def link debcontrolVcsSvn Identifier +hi def link debcontrolVcsCvs Identifier +hi def link debcontrolVcsGit Identifier +hi def link debcontrolHTTPUrl Identifier +hi def link debcontrolDmUpload Identifier +hi def link debcontrolComment Comment +hi def link debcontrolElse Special let b:current_syntax = "debcontrol" -- cgit From eb7ea6e12253d6fb9296113b01f5d257341a7a18 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 1 May 2017 13:15:27 +0200 Subject: vim-patch:369b6f57c426 Update runtime files. https://github.com/vim/vim/commit/369b6f57c426b4bf39b4a0cac8d21ed1b5f7de4d --- runtime/syntax/debcontrol.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/syntax/debcontrol.vim') diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim index b52c496c95..b1bc9f8bfe 100644 --- a/runtime/syntax/debcontrol.vim +++ b/runtime/syntax/debcontrol.vim @@ -38,7 +38,7 @@ unlet s:kernels s:archs s:pairs syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)" syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+" syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)" -syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)" +syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|javascript|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)" syn match debcontrolPackageType contained "u\?deb" syn match debcontrolVariable contained "\${.\{-}}" syn match debcontrolDmUpload contained "\cyes" -- cgit