]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / vim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 536551e)
- mark CursorLine & CursorColumn with different background - no more bold+italic
authorStefan Wimmer <wimstefan@gmail.com>
Mon, 8 Jun 2020 08:47:36 +0000 (10:47 +0200)
committerStefan Wimmer <wimstefan@gmail.com>
Mon, 8 Jun 2020 08:47:36 +0000 (10:47 +0200)
- diff colours depend on the background now

colors/artesanal.vim patch | blob | history
doc/artesanal.txt patch | blob | history
templates/_common.colortemplate patch | blob | history
templates/_dark.colortemplate patch | blob | history
templates/_light.colortemplate patch | blob | history

diff --git a/colors/artesanal.vim b/colors/artesanal.vim
index b6e71f3cf964460e206e9235a16843023371916a..59547b95d452d60c1379b4c120ca19d5a01b398f 100644 (file)
--- a/colors/artesanal.vim
+++ b/colors/artesanal.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)
-" Last Updated: Fri 01 May 2020 01:51:52 PM CEST
+" Last Updated: Fri 05 Jun 2020 12:44:11 PM CEST
 
 " Generated by Colortemplate v2.0.0
 
 
 " Generated by Colortemplate v2.0.0
 
@@ -42,7 +42,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
       let g:terminal_color_15 = '#eff1f4'
     endif
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
       let g:terminal_color_15 = '#eff1f4'
     endif
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
-      if &background ==# 'light'
+      if !has('gui_running') && &background ==# 'light'
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
           hi Normal guifg=#000000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
         else
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
           hi Normal guifg=#000000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
         else
@@ -103,14 +103,14 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     endif
     hi ColorColumn guifg=NONE guibg=#37474f guisp=NONE gui=bold cterm=bold
     hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     endif
     hi ColorColumn guifg=NONE guibg=#37474f guisp=NONE gui=bold cterm=bold
     hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi CursorColumn guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
-    hi CursorLine guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
-    hi DiffAdd guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffAdded guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffChange guifg=#aec0e0 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffDelete guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffRemoved guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffText guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
+    hi! link CursorColumn CursorLine
+    hi CursorLine guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
+    hi DiffAdd guifg=NONE guibg=#259a7a guisp=NONE gui=NONE cterm=NONE
+    hi DiffAdded guifg=NONE guibg=#259a7a guisp=NONE gui=NONE cterm=NONE
+    hi DiffChange guifg=NONE guibg=#7e99b4 guisp=NONE gui=NONE cterm=NONE
+    hi DiffDelete guifg=NONE guibg=#d05a69 guisp=NONE gui=NONE cterm=NONE
+    hi DiffRemoved guifg=NONE guibg=#d05a69 guisp=NONE gui=NONE cterm=NONE
+    hi DiffText guifg=NONE guibg=#259a7a guisp=NONE gui=NONE cterm=NONE
     hi EndOfBuffer guifg=#2e3440 guibg=NONE guisp=NONE gui=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded guifg=#546e7a guibg=#37474f guisp=NONE gui=italic cterm=italic
     hi EndOfBuffer guifg=#2e3440 guibg=NONE guisp=NONE gui=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded guifg=#546e7a guibg=#37474f guisp=NONE gui=italic cterm=italic
@@ -137,7 +137,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link TabLine TabLineFill
     hi TabLineFill guifg=#cdd2db guibg=#546e7a guisp=NONE gui=NONE cterm=NONE
     hi TabLineSel guifg=#e4e6eb guibg=#37474f guisp=NONE gui=NONE cterm=NONE
     hi! link TabLine TabLineFill
     hi TabLineFill guifg=#cdd2db guibg=#546e7a guisp=NONE gui=NONE cterm=NONE
     hi TabLineSel guifg=#e4e6eb guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-    hi Title guifg=#eff1f4 guibg=NONE guisp=NONE gui=bold cterm=bold
+    hi Title guifg=#e84256 guibg=NONE guisp=NONE gui=bold cterm=bold
     hi Visual guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
     hi Visual guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
@@ -180,8 +180,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi CommandMode guifg=#fa75e2 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
     hi Warnings guifg=#fff176 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
     if !s:italics
     hi CommandMode guifg=#fa75e2 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
     hi Warnings guifg=#fff176 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
     if !s:italics
-      hi CursorColumn gui=bold cterm=bold
-      hi CursorLine gui=bold cterm=bold
       hi Folded gui=NONE cterm=NONE
       hi SpellBad gui=undercurl cterm=undercurl
       hi SpellCap gui=undercurl cterm=undercurl
       hi Folded gui=NONE cterm=NONE
       hi SpellBad gui=undercurl cterm=undercurl
       hi SpellCap gui=undercurl cterm=undercurl
@@ -218,7 +216,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     let g:terminal_color_15 = '#ffffff'
   endif
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
     let g:terminal_color_15 = '#ffffff'
   endif
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
-    if &background ==# 'light'
+    if !has('gui_running') && &background ==# 'light'
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
         hi Normal guifg=#000000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
       else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
         hi Normal guifg=#000000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
       else
@@ -279,14 +277,14 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   endif
   hi ColorColumn guifg=NONE guibg=#e4e6eb guisp=NONE gui=bold cterm=bold
   hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   endif
   hi ColorColumn guifg=NONE guibg=#e4e6eb guisp=NONE gui=bold cterm=bold
   hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi CursorColumn guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
-  hi CursorLine guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
-  hi DiffAdd guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffAdded guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffChange guifg=#aec0e0 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffDelete guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffRemoved guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffText guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
+  hi! link CursorColumn CursorLine
+  hi CursorLine guifg=NONE guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
+  hi DiffAdd guifg=NONE guibg=#abddcc guisp=NONE gui=NONE cterm=NONE
+  hi DiffAdded guifg=NONE guibg=#abddcc guisp=NONE gui=NONE cterm=NONE
+  hi DiffChange guifg=NONE guibg=#aec0e0 guisp=NONE gui=NONE cterm=NONE
+  hi DiffDelete guifg=NONE guibg=#ddabbc guisp=NONE gui=NONE cterm=NONE
+  hi DiffRemoved guifg=NONE guibg=#ddabbc guisp=NONE gui=NONE cterm=NONE
+  hi DiffText guifg=NONE guibg=#abddcc guisp=NONE gui=NONE cterm=NONE
   hi EndOfBuffer guifg=#eff1f4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded guifg=#b6bdcb guibg=#e4e6eb guisp=NONE gui=italic cterm=italic
   hi EndOfBuffer guifg=#eff1f4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded guifg=#b6bdcb guibg=#e4e6eb guisp=NONE gui=italic cterm=italic
@@ -313,7 +311,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link TabLine TabLineFill
   hi TabLineFill guifg=#455a64 guibg=#b6bdcb guisp=NONE gui=NONE cterm=NONE
   hi TabLineSel guifg=#37474f guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
   hi! link TabLine TabLineFill
   hi TabLineFill guifg=#455a64 guibg=#b6bdcb guisp=NONE gui=NONE cterm=NONE
   hi TabLineSel guifg=#37474f guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-  hi Title guifg=#2e3440 guibg=NONE guisp=NONE gui=bold cterm=bold
+  hi Title guifg=#ae1528 guibg=NONE guisp=NONE gui=bold cterm=bold
   hi Visual guifg=NONE guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
   hi! link VisualNOS Visual
   hi! link Boolean Constant
   hi Visual guifg=NONE guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
   hi! link VisualNOS Visual
   hi! link Boolean Constant
@@ -356,8 +354,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi CommandMode guifg=#b300a4 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
   hi Warnings guifg=#ff8c00 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
   if !s:italics
   hi CommandMode guifg=#b300a4 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
   hi Warnings guifg=#ff8c00 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
   if !s:italics
-    hi CursorColumn gui=bold cterm=bold
-    hi CursorLine gui=bold cterm=bold
     hi Folded gui=NONE cterm=NONE
     hi SpellBad gui=undercurl cterm=undercurl
     hi SpellCap gui=undercurl cterm=undercurl
     hi Folded gui=NONE cterm=NONE
     hi SpellBad gui=undercurl cterm=undercurl
     hi SpellCap gui=undercurl cterm=undercurl
@@ -375,7 +371,7 @@ endif
 if s:t_Co >= 256
   if &background ==# 'dark'
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
 if s:t_Co >= 256
   if &background ==# 'dark'
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
-      if &background ==# 'light'
+      if !has('gui_running') && &background ==# 'light'
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
           hi Normal ctermfg=16 ctermbg=NONE cterm=NONE
         else
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
           hi Normal ctermfg=16 ctermbg=NONE cterm=NONE
         else
@@ -445,14 +441,14 @@ if s:t_Co >= 256
     endif
     hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     endif
     hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
-    hi DiffAdd ctermfg=152 ctermbg=233 cterm=reverse
-    hi DiffAdded ctermfg=152 ctermbg=233 cterm=reverse
-    hi DiffChange ctermfg=153 ctermbg=233 cterm=reverse
-    hi DiffDelete ctermfg=181 ctermbg=233 cterm=reverse
-    hi DiffRemoved ctermfg=181 ctermbg=233 cterm=reverse
-    hi DiffText ctermfg=152 ctermbg=233 cterm=reverse
+    hi! link CursorColumn CursorLine
+    hi CursorLine ctermfg=NONE ctermbg=238 cterm=NONE
+    hi DiffAdd ctermfg=NONE ctermbg=36 cterm=NONE
+    hi DiffAdded ctermfg=NONE ctermbg=36 cterm=NONE
+    hi DiffChange ctermfg=NONE ctermbg=110 cterm=NONE
+    hi DiffDelete ctermfg=NONE ctermbg=167 cterm=NONE
+    hi DiffRemoved ctermfg=NONE ctermbg=167 cterm=NONE
+    hi DiffText ctermfg=NONE ctermbg=36 cterm=NONE
     hi EndOfBuffer ctermfg=236 ctermbg=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=242 ctermbg=238 cterm=NONE
     hi EndOfBuffer ctermfg=236 ctermbg=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=242 ctermbg=238 cterm=NONE
@@ -479,7 +475,7 @@ if s:t_Co >= 256
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=252 ctermbg=242 cterm=NONE
     hi TabLineSel ctermfg=254 ctermbg=238 cterm=NONE
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=252 ctermbg=242 cterm=NONE
     hi TabLineSel ctermfg=254 ctermbg=238 cterm=NONE
-    hi Title ctermfg=255 ctermbg=NONE cterm=bold
+    hi Title ctermfg=167 ctermbg=NONE cterm=bold
     hi Visual ctermfg=NONE ctermbg=238 cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
     hi Visual ctermfg=NONE ctermbg=238 cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
@@ -521,10 +517,6 @@ if s:t_Co >= 256
     hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse
     hi CommandMode ctermfg=206 ctermbg=236 cterm=reverse
     hi Warnings ctermfg=228 ctermbg=236 cterm=reverse
     hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse
     hi CommandMode ctermfg=206 ctermbg=236 cterm=reverse
     hi Warnings ctermfg=228 ctermbg=236 cterm=reverse
-    if !s:italics
-      hi CursorColumn cterm=bold
-      hi CursorLine cterm=bold
-    endif
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC ctermfg=238 ctermbg=254 cterm=NONE
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC ctermfg=238 ctermbg=254 cterm=NONE
@@ -534,7 +526,7 @@ if s:t_Co >= 256
   endif
   " Light background
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
   endif
   " Light background
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
-    if &background ==# 'light'
+    if !has('gui_running') && &background ==# 'light'
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
         hi Normal ctermfg=16 ctermbg=NONE cterm=NONE
       else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
         hi Normal ctermfg=16 ctermbg=NONE cterm=NONE
       else
@@ -595,14 +587,14 @@ if s:t_Co >= 256
   endif
   hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   endif
   hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
-  hi DiffAdd ctermfg=152 ctermbg=233 cterm=reverse
-  hi DiffAdded ctermfg=152 ctermbg=233 cterm=reverse
-  hi DiffChange ctermfg=153 ctermbg=233 cterm=reverse
-  hi DiffDelete ctermfg=181 ctermbg=233 cterm=reverse
-  hi DiffRemoved ctermfg=181 ctermbg=233 cterm=reverse
-  hi DiffText ctermfg=152 ctermbg=233 cterm=reverse
+  hi! link CursorColumn CursorLine
+  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
+  hi DiffAdd ctermfg=NONE ctermbg=152 cterm=NONE
+  hi DiffAdded ctermfg=NONE ctermbg=152 cterm=NONE
+  hi DiffChange ctermfg=NONE ctermbg=153 cterm=NONE
+  hi DiffDelete ctermfg=NONE ctermbg=181 cterm=NONE
+  hi DiffRemoved ctermfg=NONE ctermbg=181 cterm=NONE
+  hi DiffText ctermfg=NONE ctermbg=152 cterm=NONE
   hi EndOfBuffer ctermfg=255 ctermbg=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE
   hi EndOfBuffer ctermfg=255 ctermbg=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE
@@ -629,7 +621,7 @@ if s:t_Co >= 256
   hi! link TabLine TabLineFill
   hi TabLineFill ctermfg=240 ctermbg=250 cterm=NONE
   hi TabLineSel ctermfg=238 ctermbg=254 cterm=NONE
   hi! link TabLine TabLineFill
   hi TabLineFill ctermfg=240 ctermbg=250 cterm=NONE
   hi TabLineSel ctermfg=238 ctermbg=254 cterm=NONE
-  hi Title ctermfg=236 ctermbg=NONE cterm=bold
+  hi Title ctermfg=124 ctermbg=NONE cterm=bold
   hi Visual ctermfg=NONE ctermbg=254 cterm=NONE
   hi! link VisualNOS Visual
   hi! link Boolean Constant
   hi Visual ctermfg=NONE ctermbg=254 cterm=NONE
   hi! link VisualNOS Visual
   hi! link Boolean Constant
@@ -671,10 +663,6 @@ if s:t_Co >= 256
   hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse
   hi CommandMode ctermfg=127 ctermbg=255 cterm=reverse
   hi Warnings ctermfg=208 ctermbg=255 cterm=reverse
   hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse
   hi CommandMode ctermfg=127 ctermbg=255 cterm=reverse
   hi Warnings ctermfg=208 ctermbg=255 cterm=reverse
-  if !s:italics
-    hi CursorColumn cterm=bold
-    hi CursorLine cterm=bold
-  endif
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC ctermfg=254 ctermbg=238 cterm=NONE
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC ctermfg=254 ctermbg=238 cterm=NONE
@@ -686,7 +674,7 @@ endif
 if s:t_Co >= 16
   if &background ==# 'dark'
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
 if s:t_Co >= 16
   if &background ==# 'dark'
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
-      if &background ==# 'light'
+      if !has('gui_running') && &background ==# 'light'
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
           hi Normal ctermfg=Black ctermbg=NONE cterm=NONE
         else
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
           hi Normal ctermfg=Black ctermbg=NONE cterm=NONE
         else
@@ -747,14 +735,14 @@ if s:t_Co >= 16
     endif
     hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     endif
     hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
-    hi DiffAdd ctermfg=LightGreen ctermbg=Black cterm=reverse
-    hi DiffAdded ctermfg=LightGreen ctermbg=Black cterm=reverse
-    hi DiffChange ctermfg=LightBlue ctermbg=Black cterm=reverse
-    hi DiffDelete ctermfg=LightRed ctermbg=Black cterm=reverse
-    hi DiffRemoved ctermfg=LightRed ctermbg=Black cterm=reverse
-    hi DiffText ctermfg=LightGreen ctermbg=Black cterm=reverse
+    hi! link CursorColumn CursorLine
+    hi CursorLine ctermfg=NONE ctermbg=Black cterm=NONE
+    hi DiffAdd ctermfg=NONE ctermbg=Green cterm=NONE
+    hi DiffAdded ctermfg=NONE ctermbg=Green cterm=NONE
+    hi DiffChange ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi DiffDelete ctermfg=NONE ctermbg=Red cterm=NONE
+    hi DiffRemoved ctermfg=NONE ctermbg=Red cterm=NONE
+    hi DiffText ctermfg=NONE ctermbg=Green cterm=NONE
     hi EndOfBuffer ctermfg=Black ctermbg=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE
     hi EndOfBuffer ctermfg=Black ctermbg=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE
@@ -781,7 +769,7 @@ if s:t_Co >= 16
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=LightGrey ctermbg=DarkGrey cterm=NONE
     hi TabLineSel ctermfg=White ctermbg=Black cterm=NONE
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=LightGrey ctermbg=DarkGrey cterm=NONE
     hi TabLineSel ctermfg=White ctermbg=Black cterm=NONE
-    hi Title ctermfg=White ctermbg=NONE cterm=bold
+    hi Title ctermfg=Red ctermbg=NONE cterm=bold
     hi Visual ctermfg=NONE ctermbg=Black cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
     hi Visual ctermfg=NONE ctermbg=Black cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
@@ -823,10 +811,6 @@ if s:t_Co >= 16
     hi VisualMode ctermfg=Yellow ctermbg=Black cterm=reverse
     hi CommandMode ctermfg=Magenta ctermbg=Black cterm=reverse
     hi Warnings ctermfg=Yellow ctermbg=Black cterm=reverse
     hi VisualMode ctermfg=Yellow ctermbg=Black cterm=reverse
     hi CommandMode ctermfg=Magenta ctermbg=Black cterm=reverse
     hi Warnings ctermfg=Yellow ctermbg=Black cterm=reverse
-    if !s:italics
-      hi CursorColumn cterm=bold
-      hi CursorLine cterm=bold
-    endif
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC ctermfg=Black ctermbg=White cterm=NONE
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC ctermfg=Black ctermbg=White cterm=NONE
@@ -836,7 +820,7 @@ if s:t_Co >= 16
   endif
   " Light background
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
   endif
   " Light background
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
-    if &background ==# 'light'
+    if !has('gui_running') && &background ==# 'light'
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
         hi Normal ctermfg=Black ctermbg=NONE cterm=NONE
       else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
         hi Normal ctermfg=Black ctermbg=NONE cterm=NONE
       else
@@ -897,14 +881,14 @@ if s:t_Co >= 16
   endif
   hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   endif
   hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
-  hi DiffAdd ctermfg=LightGreen ctermbg=Black cterm=reverse
-  hi DiffAdded ctermfg=LightGreen ctermbg=Black cterm=reverse
-  hi DiffChange ctermfg=LightBlue ctermbg=Black cterm=reverse
-  hi DiffDelete ctermfg=LightRed ctermbg=Black cterm=reverse
-  hi DiffRemoved ctermfg=LightRed ctermbg=Black cterm=reverse
-  hi DiffText ctermfg=LightGreen ctermbg=Black cterm=reverse
+  hi! link CursorColumn CursorLine
+  hi CursorLine ctermfg=NONE ctermbg=White cterm=NONE
+  hi DiffAdd ctermfg=NONE ctermbg=LightGreen cterm=NONE
+  hi DiffAdded ctermfg=NONE ctermbg=LightGreen cterm=NONE
+  hi DiffChange ctermfg=NONE ctermbg=LightBlue cterm=NONE
+  hi DiffDelete ctermfg=NONE ctermbg=LightRed cterm=NONE
+  hi DiffRemoved ctermfg=NONE ctermbg=LightRed cterm=NONE
+  hi DiffText ctermfg=NONE ctermbg=LightGreen cterm=NONE
   hi EndOfBuffer ctermfg=White ctermbg=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE
   hi EndOfBuffer ctermfg=White ctermbg=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE
@@ -931,7 +915,7 @@ if s:t_Co >= 16
   hi! link TabLine TabLineFill
   hi TabLineFill ctermfg=DarkGrey ctermbg=DarkGrey cterm=NONE
   hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
   hi! link TabLine TabLineFill
   hi TabLineFill ctermfg=DarkGrey ctermbg=DarkGrey cterm=NONE
   hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
-  hi Title ctermfg=Black ctermbg=NONE cterm=bold
+  hi Title ctermfg=Red ctermbg=NONE cterm=bold
   hi Visual ctermfg=NONE ctermbg=White cterm=NONE
   hi! link VisualNOS Visual
   hi! link Boolean Constant
   hi Visual ctermfg=NONE ctermbg=White cterm=NONE
   hi! link VisualNOS Visual
   hi! link Boolean Constant
@@ -973,10 +957,6 @@ if s:t_Co >= 16
   hi VisualMode ctermfg=Yellow ctermbg=White cterm=reverse
   hi CommandMode ctermfg=Magenta ctermbg=White cterm=reverse
   hi Warnings ctermfg=Yellow ctermbg=White cterm=reverse
   hi VisualMode ctermfg=Yellow ctermbg=White cterm=reverse
   hi CommandMode ctermfg=Magenta ctermbg=White cterm=reverse
   hi Warnings ctermfg=Yellow ctermbg=White cterm=reverse
-  if !s:italics
-    hi CursorColumn cterm=bold
-    hi CursorLine cterm=bold
-  endif
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC ctermfg=White ctermbg=Black cterm=NONE
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC ctermfg=White ctermbg=Black cterm=NONE
@@ -1002,15 +982,18 @@ endif
 " Color: red                  #ae1528     ~        Red
 " Color: brightred            #ddabbc     ~        LightRed
 " Color: darkred              #971223     ~        DarkRed
 " Color: red                  #ae1528     ~        Red
 " Color: brightred            #ddabbc     ~        LightRed
 " Color: darkred              #971223     ~        DarkRed
+" Color: diffred              #ddabbc     ~        LightRed
 " Color: green                #009a5a     ~        Green
 " Color: brightgreen          #abddcc     ~        LightGreen
 " Color: darkgreen            #00814b     ~        DarkGreen
 " Color: green                #009a5a     ~        Green
 " Color: brightgreen          #abddcc     ~        LightGreen
 " Color: darkgreen            #00814b     ~        DarkGreen
+" Color: diffgreen            #abddcc     ~        LightGreen
 " Color: yellow               #ff8c00     ~        Yellow
 " Color: brightyellow         #ffc57f     ~        LightYellow
 " Color: darkyellow           #cc7000     ~        DarkYellow
 " Color: blue                 #004bb4     ~        Blue
 " Color: brightblue           #aec0e0     ~        LightBlue
 " Color: darkblue             #00409b     ~        DarkBlue
 " Color: yellow               #ff8c00     ~        Yellow
 " Color: brightyellow         #ffc57f     ~        LightYellow
 " Color: darkyellow           #cc7000     ~        DarkYellow
 " Color: blue                 #004bb4     ~        Blue
 " Color: brightblue           #aec0e0     ~        LightBlue
 " Color: darkblue             #00409b     ~        DarkBlue
+" Color: diffblue             #aec0e0     ~        LightBlue
 " Color: magenta              #b300a4     ~        Magenta
 " Color: brightmagenta        #fc86ec     ~        LightMagenta
 " Color: darkmagenta          #9a008d     ~        DarkMagenta
 " Color: magenta              #b300a4     ~        Magenta
 " Color: brightmagenta        #fc86ec     ~        LightMagenta
 " Color: darkmagenta          #9a008d     ~        DarkMagenta
@@ -1038,15 +1021,18 @@ endif
 " Color: red                  #e84256     ~        Red
 " Color: brightred            #ddabbc     ~        LightRed
 " Color: darkred              #dc1b33     ~        DarkRed
 " Color: red                  #e84256     ~        Red
 " Color: brightred            #ddabbc     ~        LightRed
 " Color: darkred              #dc1b33     ~        DarkRed
+" Color: diffred              #d05a69     ~        Red
 " Color: green                #00bf8a     ~        Green
 " Color: brightgreen          #abddcc     ~        LightGreen
 " Color: darkgreen            #008c65     ~        DarkGreen
 " Color: green                #00bf8a     ~        Green
 " Color: brightgreen          #abddcc     ~        LightGreen
 " Color: darkgreen            #008c65     ~        DarkGreen
+" Color: diffgreen            #259a7a     ~        Green
 " Color: yellow               #fff176     ~        Yellow
 " Color: brightyellow         #ffffa8     ~        LightYellow
 " Color: darkyellow           #e5d85c     ~        DarkYellow
 " Color: blue                 #6699cc     ~        Blue
 " Color: brightblue           #aec0e0     ~        LightBlue
 " Color: darkblue             #517aa3     ~        DarkBlue
 " Color: yellow               #fff176     ~        Yellow
 " Color: brightyellow         #ffffa8     ~        LightYellow
 " Color: darkyellow           #e5d85c     ~        DarkYellow
 " Color: blue                 #6699cc     ~        Blue
 " Color: brightblue           #aec0e0     ~        LightBlue
 " Color: darkblue             #517aa3     ~        DarkBlue
+" Color: diffblue             #7e99b4     ~        Blue
 " Color: magenta              #fa75e2     ~        Magenta
 " Color: brightmagenta        #fc86ec     ~        LightMagenta
 " Color: darkmagenta          #f844d8     ~        DarkMagenta
 " Color: magenta              #fa75e2     ~        Magenta
 " Color: brightmagenta        #fc86ec     ~        LightMagenta
 " Color: darkmagenta          #f844d8     ~        DarkMagenta
diff --git a/doc/artesanal.txt b/doc/artesanal.txt
index 0fc74558207e4e15746ed4c9c21b7e140dcb45b4..e90c6842a77475db793ef4e3c60c40a1559d07c1 100644 (file)
--- a/doc/artesanal.txt
+++ b/doc/artesanal.txt
@@ -1,4 +1,4 @@
-*artesanal.txt*       For Vim version 8.2       Last change: 2020 May 01
+*artesanal.txt*       For Vim version 8.2       Last change: 2020 Jun 05
 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>
 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>
diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index 10fdf3c059e4e40bff16e0bac090315cfc2b4dae..52e5bbaa8c9db29b34d2dfe2244f24f11c3a3ca0 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -3,7 +3,7 @@
 # Default highlight groups {{{
 #if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0)
   # dimmed colours
 # Default highlight groups {{{
 #if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0)
   # dimmed colours
-  #if &background ==# 'light'
+  #if !has('gui_running') && &background ==# 'light'
     #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
       Normal                       realblack    none
     #else
     #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
       Normal                       realblack    none
     #else
@@ -69,14 +69,14 @@
 # Group                          Fg           Bg      Attributes
 ColorColumn                      none         bg1     bold
 Cursor                           none         none    reverse,bold
 # Group                          Fg           Bg      Attributes
 ColorColumn                      none         bg1     bold
 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
-DiffDelete                       brightred    black   reverse
-DiffRemoved                      brightred    black   reverse
-DiffText                         brightgreen  black   reverse
+CursorColumn                  -> CursorLine
+CursorLine                       none         bg1
+DiffAdd                          none         diffgreen
+DiffAdded                        none         diffgreen
+DiffChange                       none         diffblue
+DiffDelete                       none         diffred
+DiffRemoved                      none         diffred
+DiffText                         none         diffgreen
 EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error
 Folded                           bg3          bg1     g=italic
 EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error
 Folded                           bg3          bg1     g=italic
@@ -103,7 +103,7 @@ StatusLineTermNC              -> StatusLineNC
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1
-Title                            fg0          none    bold
+Title                            red          none   bold
 Visual                           none         bg1
 VisualNOS                     -> Visual
 # Other conventional group names (see `:help group-name`)
 Visual                           none         bg1
 VisualNOS                     -> Visual
 # Other conventional group names (see `:help group-name`)
diff --git a/templates/_dark.colortemplate b/templates/_dark.colortemplate
index cf8ed91199154b42cc15b087da7e095dcc64aa21..1ec41b95d124c63bd1496c8a4e8749974b189d39 100644 (file)
--- a/templates/_dark.colortemplate
+++ b/templates/_dark.colortemplate
@@ -8,15 +8,18 @@ Color: darkgray             #575c66     ~        DarkGray
 Color: red                  #e84256     ~        Red
 Color: brightred            #ddabbc     ~        LightRed
 Color: darkred              #dc1b33     ~        DarkRed
 Color: red                  #e84256     ~        Red
 Color: brightred            #ddabbc     ~        LightRed
 Color: darkred              #dc1b33     ~        DarkRed
+Color: diffred              #d05a69     ~        Red
 Color: green                #00bf8a     ~        Green
 Color: brightgreen          #abddcc     ~        LightGreen
 Color: darkgreen            #008c65     ~        DarkGreen
 Color: green                #00bf8a     ~        Green
 Color: brightgreen          #abddcc     ~        LightGreen
 Color: darkgreen            #008c65     ~        DarkGreen
+Color: diffgreen            #259a7a     ~        Green
 Color: yellow               #fff176     ~        Yellow
 Color: brightyellow         #ffffa8     ~        LightYellow
 Color: darkyellow           #e5d85c     ~        DarkYellow
 Color: blue                 #6699cc     ~        Blue
 Color: brightblue           #aec0e0     ~        LightBlue
 Color: darkblue             #517aa3     ~        DarkBlue
 Color: yellow               #fff176     ~        Yellow
 Color: brightyellow         #ffffa8     ~        LightYellow
 Color: darkyellow           #e5d85c     ~        DarkYellow
 Color: blue                 #6699cc     ~        Blue
 Color: brightblue           #aec0e0     ~        LightBlue
 Color: darkblue             #517aa3     ~        DarkBlue
+Color: diffblue             #7e99b4     ~        Blue
 Color: magenta              #fa75e2     ~        Magenta
 Color: brightmagenta        #fc86ec     ~        LightMagenta
 Color: darkmagenta          #f844d8     ~        DarkMagenta
 Color: magenta              #fa75e2     ~        Magenta
 Color: brightmagenta        #fc86ec     ~        LightMagenta
 Color: darkmagenta          #f844d8     ~        DarkMagenta
diff --git a/templates/_light.colortemplate b/templates/_light.colortemplate
index c2b15675793982ad73f40a93d2c3edc460b0e81b..8a6baf43efe2bd034a83efaee07150ffe3674ac2 100644 (file)
--- a/templates/_light.colortemplate
+++ b/templates/_light.colortemplate
@@ -8,15 +8,18 @@ Color: darkgray             #575c66     ~        DarkGray
 Color: red                  #ae1528     ~        Red
 Color: brightred            #ddabbc     ~        LightRed
 Color: darkred              #971223     ~        DarkRed
 Color: red                  #ae1528     ~        Red
 Color: brightred            #ddabbc     ~        LightRed
 Color: darkred              #971223     ~        DarkRed
+Color: diffred              #ddabbc     ~        LightRed
 Color: green                #009a5a     ~        Green
 Color: brightgreen          #abddcc     ~        LightGreen
 Color: darkgreen            #00814b     ~        DarkGreen
 Color: green                #009a5a     ~        Green
 Color: brightgreen          #abddcc     ~        LightGreen
 Color: darkgreen            #00814b     ~        DarkGreen
+Color: diffgreen            #abddcc     ~        LightGreen
 Color: yellow               #ff8c00     ~        Yellow
 Color: brightyellow         #ffc57f     ~        LightYellow
 Color: darkyellow           #cc7000     ~        DarkYellow
 Color: blue                 #004bb4     ~        Blue
 Color: brightblue           #aec0e0     ~        LightBlue
 Color: darkblue             #00409b     ~        DarkBlue
 Color: yellow               #ff8c00     ~        Yellow
 Color: brightyellow         #ffc57f     ~        LightYellow
 Color: darkyellow           #cc7000     ~        DarkYellow
 Color: blue                 #004bb4     ~        Blue
 Color: brightblue           #aec0e0     ~        LightBlue
 Color: darkblue             #00409b     ~        DarkBlue
+Color: diffblue             #aec0e0     ~        LightBlue
 Color: magenta              #b300a4     ~        Magenta
 Color: brightmagenta        #fc86ec     ~        LightMagenta
 Color: darkmagenta          #9a008d     ~        DarkMagenta
 Color: magenta              #b300a4     ~        Magenta
 Color: brightmagenta        #fc86ec     ~        LightMagenta
 Color: darkmagenta          #9a008d     ~        DarkMagenta
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.