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/form.vim | 83 +++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) (limited to 'runtime/syntax/form.vim') diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim index 19a47ed6b9..abd1c489dd 100644 --- a/runtime/syntax/form.vim +++ b/runtime/syntax/form.vim @@ -11,11 +11,8 @@ " This syntax file is still in development. Please send suggestions " to the maintainer. -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -109,49 +106,41 @@ syn match formDirective "^\=\.[a-zA-z][a-zA-Z0-9]*\>" syn sync ccomment formComment minlines=10 " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_form_syn_inits") - if version < 508 - let did_form_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink formConditional Conditional - HiLink formNumber Number - HiLink formStatement Statement - HiLink formComment Comment - HiLink formPreProc PreProc - HiLink formDirective PreProc - HiLink formType Type - HiLink formString String - HiLink formNestedString String - HiLink formReserved Error - HiLink formTodo Todo - HiLink formSpecial SpecialChar - - if !exists("form_enhanced_color") - HiLink formHeaderStatement Statement - else - " enhanced color mode - HiLink formHeaderStatement HeaderStatement - " dark and a light background for local types - if &background == "dark" - hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold - else - hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold - endif - " change slightly the default for dark gvim - if has("gui_running") && &background == "dark" - hi Conditional guifg=LightBlue gui=bold - hi Statement guifg=LightYellow - endif - endif - - delcommand HiLink +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink formConditional Conditional +HiLink formNumber Number +HiLink formStatement Statement +HiLink formComment Comment +HiLink formPreProc PreProc +HiLink formDirective PreProc +HiLink formType Type +HiLink formString String +HiLink formNestedString String +HiLink formReserved Error +HiLink formTodo Todo +HiLink formSpecial SpecialChar + +if !exists("form_enhanced_color") +HiLink formHeaderStatement Statement +else +" enhanced color mode +HiLink formHeaderStatement HeaderStatement +" dark and a light background for local types +if &background == "dark" +hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold +else +hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold endif +" change slightly the default for dark gvim +if has("gui_running") && &background == "dark" +hi Conditional guifg=LightBlue gui=bold +hi Statement guifg=LightYellow +endif +endif + +delcommand HiLink let b:current_syntax = "form" -- 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/form.vim | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'runtime/syntax/form.vim') diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim index abd1c489dd..b8cb87c905 100644 --- a/runtime/syntax/form.vim +++ b/runtime/syntax/form.vim @@ -107,26 +107,25 @@ syn sync ccomment formComment minlines=10 " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink formConditional Conditional -HiLink formNumber Number -HiLink formStatement Statement -HiLink formComment Comment -HiLink formPreProc PreProc -HiLink formDirective PreProc -HiLink formType Type -HiLink formString String -HiLink formNestedString String -HiLink formReserved Error -HiLink formTodo Todo -HiLink formSpecial SpecialChar + +hi def link formConditional Conditional +hi def link formNumber Number +hi def link formStatement Statement +hi def link formComment Comment +hi def link formPreProc PreProc +hi def link formDirective PreProc +hi def link formType Type +hi def link formString String +hi def link formNestedString String +hi def link formReserved Error +hi def link formTodo Todo +hi def link formSpecial SpecialChar if !exists("form_enhanced_color") -HiLink formHeaderStatement Statement +hi def link formHeaderStatement Statement else " enhanced color mode -HiLink formHeaderStatement HeaderStatement +hi def link formHeaderStatement HeaderStatement " dark and a light background for local types if &background == "dark" hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold @@ -140,7 +139,6 @@ hi Statement guifg=LightYellow endif endif -delcommand HiLink let b:current_syntax = "form" -- cgit From 8c6168565cb5dade92f9da51c1c9e96882029eaa Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Tue, 7 Nov 2017 19:34:37 +0100 Subject: vim-patch:37c64c78fd87 Note: Ignored changes to matchit.vim in favor of faca81411628. --- Update runtime files. https://github.com/vim/vim/commit/37c64c78fd87e086b5a945ad7032787c274e2dcb --- runtime/syntax/form.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'runtime/syntax/form.vim') diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim index b8cb87c905..9718480da3 100644 --- a/runtime/syntax/form.vim +++ b/runtime/syntax/form.vim @@ -85,7 +85,7 @@ syn match formComment "\;\ *\*.*$" contains=formTodo syn region formString start=+"+ end=+"+ contains=formSpecial syn region formString start=+'+ end=+'+ syn region formNestedString start=+`+ end=+'+ contains=formNestedString -syn match formPreProc "^\=\#[a-zA-z][a-zA-Z0-9]*\>" +syn match formPreProc "^\=\#[a-zA-Z][a-zA-Z0-9]*\>" syn match formNumber "\<\d\+\>" syn match formNumber "\<\d\+\.\d*\>" syn match formNumber "\.\d\+\>" @@ -94,13 +94,13 @@ syn match formNumber "-\.\d" contains=Number syn match formNumber "i_\+\>" syn match formNumber "fac_\+\>" " pattern matching wildcards -syn match formNumber "?[A-z0-9]*" +syn match formNumber "?[a-zA-Z0-9]*" " dollar-variables (new in 3.x) -syn match formNumber "\\$[A-z0-9]*" +syn match formNumber "\\$[a-zA-Z0-9]*" " scalar products -syn match formNumber "^\=[a-zA-z][a-zA-Z0-9]*\.[a-zA-z][a-zA-Z0-9]*\>" +syn match formNumber "^\=[a-zA-Z][a-zA-Z0-9]*\.[a-zA-Z][a-zA-Z0-9]*\>" -syn match formDirective "^\=\.[a-zA-z][a-zA-Z0-9]*\>" +syn match formDirective "^\=\.[a-zA-Z][a-zA-Z0-9]*\>" " hi User Labels syn sync ccomment formComment minlines=10 -- cgit