Mercurial > vim

diff runtime/colors/wildcharm.vim @ 34103:21f02c883646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runtime(colorschemes): Add initial support for Added/Removed/Changed highlight groups (#13830) Commit: https://github.com/vim/vim/commit/5f4cc8ea65e80efa35f84fe9a9985a42c3c96bae Author: Maxim Kim <habamax@gmail.com> Date: Tue Jan 9 06:14:04 2024 +1100 runtime(colorschemes): Add initial support for Added/Removed/Changed highlight groups (https://github.com/vim/vim/issues/13830) For some of the colorschemes where diffAdded and diffRemoved were explicitly set up. Signed-off-by: Maxim Kim <habamax@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Mon, 08 Jan 2024 20:15:03 +0100
parents 2a36aec80c9e
children 512ee93a7241
line wrap: on
line diff
--- a/runtime/colors/wildcharm.vim
+++ b/runtime/colors/wildcharm.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:43
+" Last Updated: Mon 08 Jan 2024 09:40:36 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -93,8 +93,9 @@ if &background ==# 'dark'
   hi DiffChange guifg=#d0d0d0 guibg=#5f5f5f gui=NONE cterm=NONE
   hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
   hi DiffDelete guifg=#ffafaf guibg=#875f5f gui=NONE cterm=NONE
-  hi diffAdded guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
+  hi Added guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
+  hi Changed guifg=#0087d7 guibg=NONE gui=NONE cterm=NONE
+  hi Removed guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
 else
   " Light background
   if (has('termguicolors') && &termguicolors) || has('gui_running')
@@ -167,8 +168,9 @@ else
   hi DiffChange guifg=#262626 guibg=#dadada gui=NONE cterm=NONE
   hi DiffText guifg=#005f5f guibg=#afd7d7 gui=NONE cterm=NONE
   hi DiffDelete guifg=#875f5f guibg=#ffd7d7 gui=NONE cterm=NONE
-  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+  hi Added guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
+  hi Changed guifg=#0087d7 guibg=NONE gui=NONE cterm=NONE
+  hi Removed guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
 endif
 
 if s:t_Co >= 256
@@ -247,8 +249,9 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=252 ctermbg=59 cterm=NONE
     hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
     hi DiffDelete ctermfg=217 ctermbg=95 cterm=NONE
-    hi diffAdded ctermfg=35 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=161 ctermbg=NONE cterm=NONE
+    hi Added ctermfg=35 ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=32 ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=161 ctermbg=NONE cterm=NONE
   else
     " Light background
     hi Normal ctermfg=16 ctermbg=231 cterm=NONE
@@ -316,8 +319,9 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=235 ctermbg=253 cterm=NONE
     hi DiffText ctermfg=23 ctermbg=152 cterm=NONE
     hi DiffDelete ctermfg=95 ctermbg=224 cterm=NONE
-    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+    hi Added ctermfg=71 ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=32 ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=160 ctermbg=NONE cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -386,12 +390,13 @@ if s:t_Co >= 16
     hi Directory ctermfg=blue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   else
     " Light background
     hi Normal ctermfg=black ctermbg=white cterm=NONE
@@ -455,12 +460,13 @@ if s:t_Co >= 16
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+    hi Added ctermfg=green ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=red ctermbg=NONE cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -510,7 +516,7 @@ if s:t_Co >= 8
     hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
     hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi Folded ctermfg=grey ctermbg=NONE cterm=bold
     hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
     hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
@@ -519,20 +525,20 @@ if s:t_Co >= 8
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
     hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE
+    hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
   else
     " Light background
     hi Normal ctermfg=black ctermbg=grey cterm=NONE
@@ -586,20 +592,20 @@ if s:t_Co >= 8
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
     hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
-    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE
+    hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -700,7 +706,7 @@ endif
 " Color: colorlC                 #ff5fff        207            magenta
 " Color: colorDim                #878787        102            grey
 " Color: colorMP                 #ff00af        199            magenta
-" Color: diffAdd                 #5f875f        65             darkmagenta
+" Color: diffAdd                 #5f875f        65             darkgreen
 " Color: diffAddFg               #afffaf        157            black
 " Color: diffDelete              #875f5f        95             darkred
 " Color: diffDeleteFg            #ffafaf        217            black
@@ -739,7 +745,7 @@ endif
 " Color: colorDim                #626262        241            darkgrey
 " Color: colorSt                 #5f5f5f        59             darkgrey
 " Color: colorMP                 #ff00af        199            magenta
-" Color: diffAdd                 #afd7af        151            darkmagenta
+" Color: diffAdd                 #afd7af        151            darkgreen
 " Color: diffAddFg               #005f00        22             black
 " Color: diffDelete              #ffd7d7        224            darkred
 " Color: diffDeleteFg            #875f5f        95             black