Use default instead of overriding highlighting links

dag · Aug 11, 2013 · 6646a39 · 6646a39
1 parent 26d4731
commit 6646a39
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 107 deletions.
diff --git a/autoload/vim2hs/cabal.vim b/autoload/vim2hs/cabal.vim
@@ -5,7 +5,7 @@ function! vim2hs#cabal#comments() " {{{
     \ /--.*/
     \ display
 
-  highlight! link cabalComment Comment
+  highlight default link cabalComment Comment
 endfunction " }}}
 
 
@@ -20,8 +20,8 @@ function! vim2hs#cabal#defines() " {{{
     \ ":"
     \ display contained
 
-  highlight! link cabalDefine Define
-  highlight! link cabalDelimiter Delimiter
+  highlight default link cabalDefine Define
+  highlight default link cabalDelimiter Delimiter
 endfunction " }}}
 
 
@@ -31,8 +31,8 @@ function! vim2hs#cabal#statements() " {{{
     \ end="$"
     \ display oneline
 
-  highlight! link cabalIdentifier Identifier
-  highlight! link cabalStatement Statement
+  highlight default link cabalIdentifier Identifier
+  highlight default link cabalStatement Statement
 endfunction " }}}
 
 
@@ -49,9 +49,9 @@ function! vim2hs#cabal#conditionals() " {{{
     \ end="$"
     \ display oneline contains=cabalIdentifier,cabalKeyword
 
-  highlight! link cabalKeyword Keyword
-  highlight! link cabalIdentifier Identifier
-  highlight! link cabalConditional Conditional
+  highlight default link cabalKeyword Keyword
+  highlight default link cabalIdentifier Identifier
+  highlight default link cabalConditional Conditional
 endfunction " }}}
 
 

diff --git a/autoload/vim2hs/cabalconfig.vim b/autoload/vim2hs/cabalconfig.vim
@@ -5,7 +5,7 @@ function! vim2hs#cabalconfig#comments() " {{{
     \ /--.*/
     \ display
 
-  highlight! link ccComment Comment
+  highlight default link ccComment Comment
 endfunction " }}}
 
 
@@ -33,11 +33,11 @@ function! vim2hs#cabalconfig#constants() " {{{
     \ '\<[0-9]\+\.[0-9]\+'
     \ display
 
-  highlight! link ccDefine Define
-  highlight! link ccDelimiter Delimiter
-  highlight! link ccBoolean Boolean
-  highlight! link ccNumber Number
-  highlight! link ccFloat Float
+  highlight default link ccDefine Define
+  highlight default link ccDelimiter Delimiter
+  highlight default link ccBoolean Boolean
+  highlight default link ccNumber Number
+  highlight default link ccFloat Float
 endfunction " }}}
 
 
@@ -47,8 +47,8 @@ function! vim2hs#cabalconfig#statements() " {{{
     \ end='$'
     \ display oneline
 
-  highlight! link ccIdentifier Identifier
-  highlight! link ccStatement Statement
+  highlight default link ccIdentifier Identifier
+  highlight default link ccStatement Statement
 endfunction " }}}
 
 

diff --git a/autoload/vim2hs/haskell/conceal.vim b/autoload/vim2hs/haskell/conceal.vim
@@ -9,7 +9,7 @@ function! vim2hs#haskell#conceal#simple() " {{{
 
   setlocal conceallevel=2
 
-  highlight! link Conceal Operator
+  highlight default link Conceal Operator
 endfunction " }}}
 
 

diff --git a/autoload/vim2hs/haskell/markdown.vim b/autoload/vim2hs/haskell/markdown.vim
@@ -10,7 +10,7 @@ function! vim2hs#haskell#markdown#literate() " {{{
     \ start="^>" end="\%(^[^>]\)\@="
     \ contains=hsLiterateDelimiter,@haskell
 
-  highlight! link hsLiterateDelimiter Delimiter
+  highlight default link hsLiterateDelimiter Delimiter
 endfunction " }}}
 
 
@@ -22,5 +22,5 @@ function! vim2hs#haskell#markdown#gfm() " {{{
     \ start="^```\%(haskell\|hs\)$" end="^```$"
     \ contains=@haskell
 
-  highlight! link mkdnHaskellBlock Delimiter
+  highlight default link mkdnHaskellBlock Delimiter
 endfunction " }}}
diff --git a/autoload/vim2hs/haskell/quasi.vim b/autoload/vim2hs/haskell/quasi.vim
@@ -4,8 +4,8 @@ function! vim2hs#haskell#quasi#quote() " {{{
   syntax match hsQuasi /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsQuasiQuote
 
-  highlight! link hsQuasiQuote Delimiter
-  highlight! link hsQuasi Macro
+  highlight default link hsQuasiQuote Delimiter
+  highlight default link hsQuasi Macro
 endfunction " }}}
 
 
@@ -46,15 +46,15 @@ function! vim2hs#haskell#quasi#interpolation() " {{{
   syntax match hsRubyQQ /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsRubyQQuote contains=hsRubyInterpolation,@Spell
 
-  highlight! link hsStringQQuote Delimiter
-  highlight! link hsStringQQ String
-  highlight! link hsP6QQuote Delimiter
-  highlight! link hsP6QQ String
-  highlight! link hsP6AntiQuote PreProc
-  highlight! link hsP6Identifier Identifier
-  highlight! link hsRubyQQuote Delimiter
-  highlight! link hsRubyQQ String
-  highlight! link hsRubyAntiQuote PreProc
+  highlight default link hsStringQQuote Delimiter
+  highlight default link hsStringQQ String
+  highlight default link hsP6QQuote Delimiter
+  highlight default link hsP6QQ String
+  highlight default link hsP6AntiQuote PreProc
+  highlight default link hsP6Identifier Identifier
+  highlight default link hsRubyQQuote Delimiter
+  highlight default link hsRubyQQ String
+  highlight default link hsRubyAntiQuote PreProc
 endfunction " }}}
 
 
@@ -101,20 +101,20 @@ function! vim2hs#haskell#quasi#regex() " {{{
   syntax match hsRegexQQ /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsRegexQQuote contains=@regex
 
-  highlight! link regexSpecialChar SpecialChar
-  highlight! link regexOperator Operator
-  highlight! link regexDelimiter Delimiter
-  highlight! link regexStructure Structure
+  highlight default link regexSpecialChar SpecialChar
+  highlight default link regexOperator Operator
+  highlight default link regexDelimiter Delimiter
+  highlight default link regexStructure Structure
 
-  highlight! link hsRexQuote Delimiter
-  highlight! link hsRex String
-  highlight! link hsRexMapQuote PreProc
+  highlight default link hsRexQuote Delimiter
+  highlight default link hsRex String
+  highlight default link hsRexMapQuote PreProc
 
-  highlight! link hsRelitQuote Delimiter
-  highlight! link hsRelit String
+  highlight default link hsRelitQuote Delimiter
+  highlight default link hsRelit String
 
-  highlight! link hsRegexQQuote Delimiter
-  highlight! link hsRegexQQ String
+  highlight default link hsRegexQQuote Delimiter
+  highlight default link hsRegexQQ String
 endfunction " }}}
 
 
@@ -132,8 +132,8 @@ function! vim2hs#haskell#quasi#jmacro() " {{{
   syntax match hsJmacro /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsJmacroQuote contains=hsJmacroSplice,@jmacro
 
-  highlight! link hsJmacroQuote Delimiter
-  highlight! link hsJmacroAntiQuote PreProc
+  highlight default link hsJmacroQuote Delimiter
+  highlight default link hsJmacroAntiQuote PreProc
 endfunction " }}}
 
 
@@ -151,8 +151,8 @@ function! vim2hs#haskell#quasi#shqq() " {{{
   syntax match hsShQQ /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsShQQuote contains=hsShQQInterpolation,@shell
 
-  highlight! link hsShQQuote Delimiter
-  highlight! link hsShQQInterpolation Identifier
+  highlight default link hsShQQuote Delimiter
+  highlight default link hsShQQInterpolation Identifier
 endfunction " }}}
 
 
@@ -170,8 +170,8 @@ function! vim2hs#haskell#quasi#sql() " {{{
   syntax match hsSQL /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsSQLQuote contains=hsSQLSplice,@sql
 
-  highlight! link hsSQLQuote Delimiter
-  highlight! link hsSQLSpliceQuote Preproc
+  highlight default link hsSQLQuote Delimiter
+  highlight default link hsSQLSpliceQuote Preproc
 endfunction " }}}
 
 
@@ -207,9 +207,9 @@ function! vim2hs#haskell#quasi#json() " {{{
   syntax match hsJSON /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsJSONQuote contains=hsJSONQQKey,hsJSONQQSplice,@json
 
-  highlight! link hsJSONQuote Delimiter
-  highlight! link hsJSONQQSpliceQuote PreProc
-  highlight! link hsJSONQQKey Identifier
+  highlight default link hsJSONQuote Delimiter
+  highlight default link hsJSONQQSpliceQuote PreProc
+  highlight default link hsJSONQQKey Identifier
 endfunction " }}}
 
 
@@ -237,7 +237,7 @@ function! vim2hs#haskell#quasi#xml() " {{{
   syntax match hsXML /|\%(\_.\%(|]\)\@!\)*\_.|/hs=s+1,he=e-1
     \ contained containedin=hsXMLQuote contains=hsXMLQQElement,hsXMLQQSplice,@xml
 
-  highlight! link hsXMLQuote Delimiter
-  highlight! link hsXMLQQElementQuote PreProc
-  highlight! link hsXMLQQSpliceQuote PreProc
+  highlight default link hsXMLQuote Delimiter
+  highlight default link hsXMLQQElementQuote PreProc
+  highlight default link hsXMLQQSpliceQuote PreProc
 endfunction " }}}