- fix bad readability of CursorLine in diffs

[etc/vim.git] / templates / _common.colortemplate

diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index e85a2e1d146f721948c29b8e7b2adaded161ca34..46790f1dc4bd233f09c1b61675ac825497d6ae1d 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -1,34 +1,28 @@
 # vim: ft=colortemplate fdm=marker
 
 # Default highlight groups {{{
 # vim: ft=colortemplate fdm=marker
 
 # Default highlight groups {{{

-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)
-endverbatim
+#if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)

   # Transparent background
   Normal       fg1           none
   CursorLineNr yellow        none
   FoldColumn   darkgray      none
   SignColumn   fg2           none
   VertSplit    bg3           none
   # Transparent background
   Normal       fg1           none
   CursorLineNr yellow        none
   FoldColumn   darkgray      none
   SignColumn   fg2           none
   VertSplit    bg3           none

-verbatim
-else
-endverbatim
+#else

   # Opaque background
   Normal       fg1           bg0
   CursorLineNr yellow        bg1
   FoldColumn   darkgray      bg1
   SignColumn   fg2           bg1
   VertSplit    bg3           bg0
   # Opaque background
   Normal       fg1           bg0
   CursorLineNr yellow        bg1
   FoldColumn   darkgray      bg1
   SignColumn   fg2           bg1
   VertSplit    bg3           bg0

-verbatim
-endif
-endverbatim
+#endif

 
 # Group                          Fg           Bg      Attributes
 
 # Group                          Fg           Bg      Attributes

-ColorColumn                      none         bg1
+ColorColumn                      none         bg1     bold

 Conceal                          blue         none
 Conceal                          blue         none

-Cursor                           none         none    reverse
-CursorColumn                  -> ColorColumn
-CursorLine                    -> ColorColumn
+Cursor                           none         none    reverse,bold
+CursorColumn                     none         none    italic,bold
+CursorLine                       none         none    italic,bold

 DiffAdd                          brightgreen  black   reverse
 DiffAdded                        brightgreen  black   reverse
 DiffChange                       brightblue   black   reverse
 DiffAdd                          brightgreen  black   reverse
 DiffAdded                        brightgreen  black   reverse
 DiffChange                       brightblue   black   reverse


@@ -114,20 +108,6 @@ ToolbarLine                      none         bg3
 ToolbarButton                    fg0          bg3     bold
 # }}}
 
 ToolbarButton                    fg0          bg3     bold
 # }}}
 

-# Italics {{{
-verbatim
-if get(g:, "@optionprefix_italic", 0)
-  hi Comment cterm=italic
-  hi Folded cterm=italic
-  hi SpellBad cterm=italic,underline
-  hi SpellCap cterm=italic,underline
-  hi SpellLocal cterm=italic,underline
-  hi SpellRare cterm=italic,underline
-  hi Todo cterm=italic
-endif
-endverbatim
-# }}}
-

 # Additional highlight groups {{{
 # Input mode cursor
 iCursor                       -> Cursor
 # Additional highlight groups {{{
 # Input mode cursor
 iCursor                       -> Cursor


@@ -144,6 +124,7 @@ Warnings                         yellow       bg0     reverse
 # }}}
 
 # Terminal colors {{{
 # }}}
 
 # Terminal colors {{{

-Include: _terminal.colortemplate
+TermCursor                    -> Cursor
+TermCursorNC                     bg1          fg1

 # }}}
 
 # }}}