vim-patch:d88ebcb: runtime(colors): update habamax scheme - tweak diff/search/todo colors

- Make diff colors more accessible, Green for added, Red for deleted, Blue for Changed
- Change Search to blue to be visible with Diff colors
- Change Todo to bright magenta

closes: vim/vim#15400

https://github.com/vim/vim/commit/d88ebcbd9ff6e67c2e1ff2abf95f1782aaeed9e4

Co-authored-by: Maxim Kim <habamax@gmail.com>

1 files changed, 43 insertions, 47 deletions

diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim
index 71606f13df..a3e86dca56 100644
--- a/runtime/colors/habamax.vim
+++ b/runtime/colors/habamax.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Mon 08 Jul 2024 17:44:13
+" Last Updated: Tue 30 Jul 2024 11:07:38 AM AEST
 
 " Generated by Colortemplate v2.2.3
 
@@ -17,7 +17,7 @@ let g:colors_name = 'habamax'
 let s:t_Co = &t_Co
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#87afd7', '#d787d7', '#87afaf', '#bcbcbc']
+  let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#5fafd7', '#d787d7', '#87afaf', '#bcbcbc']
   " Nvim uses g:terminal_color_{0-15} instead
   for i in range(g:terminal_ansi_colors->len())
     let g:terminal_color_{i} = g:terminal_ansi_colors[i]
@@ -59,7 +59,7 @@ hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE
+hi Visual guifg=#87afaf guibg=#1c1c1c gui=reverse cterm=reverse
 hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
 hi Pmenu guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
@@ -78,12 +78,12 @@ hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
 hi MoreMsg guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
 hi Question guifg=#d7af87 guibg=NONE gui=NONE cterm=NONE
 hi WarningMsg guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#d7af87 guibg=#1c1c1c gui=reverse cterm=reverse
+hi Todo guifg=#d787d7 guibg=#1c1c1c gui=reverse cterm=reverse
 hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
-hi Search guifg=#1c1c1c guibg=#5faf5f gui=NONE cterm=NONE
-hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
-hi CurSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
-hi WildMenu guifg=#1c1c1c guibg=#d7af87 gui=NONE cterm=NONE
+hi Search guifg=#5fafd7 guibg=#1c1c1c gui=reverse cterm=reverse
+hi IncSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi CurSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi WildMenu guifg=#1c1c1c guibg=#d7af87 gui=bold cterm=bold
 hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
 hi debugBreakpoint guifg=#1c1c1c guibg=#d75f87 gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
@@ -111,14 +111,13 @@ hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi DiffAdd guifg=#dadada guibg=#5f875f gui=NONE cterm=NONE
-hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+hi DiffAdd guifg=#5faf5f guibg=NONE gui=reverse cterm=reverse
+hi DiffChange guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
+hi DiffText guifg=#af87af guibg=NONE gui=reverse cterm=reverse
+hi DiffDelete guifg=#af5f5f guibg=NONE gui=reverse cterm=reverse
 hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
 hi Changed guifg=#ffaf5f guibg=NONE gui=NONE cterm=NONE
 hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE
-hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE
 
 if s:t_Co >= 256
   hi! link Terminal Normal
@@ -157,7 +156,7 @@ if s:t_Co >= 256
   hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=234 ctermbg=109 cterm=NONE
+  hi Visual ctermfg=109 ctermbg=234 cterm=reverse
   hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=237 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
@@ -176,12 +175,12 @@ if s:t_Co >= 256
   hi MoreMsg ctermfg=71 ctermbg=NONE cterm=NONE
   hi Question ctermfg=180 ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=168 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=180 ctermbg=234 cterm=reverse
+  hi Todo ctermfg=176 ctermbg=234 cterm=reverse
   hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
-  hi Search ctermfg=234 ctermbg=71 cterm=NONE
-  hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE
-  hi CurSearch ctermfg=234 ctermbg=215 cterm=NONE
-  hi WildMenu ctermfg=234 ctermbg=180 cterm=NONE
+  hi Search ctermfg=74 ctermbg=234 cterm=reverse
+  hi IncSearch ctermfg=215 ctermbg=234 cterm=reverse
+  hi CurSearch ctermfg=215 ctermbg=234 cterm=reverse
+  hi WildMenu ctermfg=234 ctermbg=180 cterm=bold
   hi debugPC ctermfg=234 ctermbg=67 cterm=NONE
   hi debugBreakpoint ctermfg=234 ctermbg=168 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
@@ -207,14 +206,13 @@ if s:t_Co >= 256
   hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=253 ctermbg=65 cterm=NONE
-  hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=71 ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=67 ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=139 ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=131 ctermbg=NONE cterm=reverse
   hi Added ctermfg=77 ctermbg=NONE cterm=NONE
   hi Changed ctermfg=215 ctermbg=NONE cterm=NONE
   hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
-  hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=253 ctermbg=102 cterm=NONE
-  hi DiffChange ctermfg=250 ctermbg=59 cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -238,7 +236,7 @@ if s:t_Co >= 16
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=cyan cterm=NONE
+  hi Visual ctermfg=cyan ctermbg=black cterm=reverse
   hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
   hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
@@ -255,12 +253,12 @@ if s:t_Co >= 16
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=yellow ctermbg=black cterm=reverse
+  hi Todo ctermfg=magenta ctermbg=black cterm=reverse
   hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi IncSearch ctermfg=black ctermbg=red cterm=NONE
-  hi CurSearch ctermfg=black ctermbg=red cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi Search ctermfg=blue ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=red ctermbg=black cterm=reverse
+  hi CurSearch ctermfg=red ctermbg=black cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
   hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
   hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
@@ -286,14 +284,13 @@ if s:t_Co >= 16
   hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
   hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -334,9 +331,9 @@ if s:t_Co >= 8
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi Todo ctermfg=darkmagenta ctermbg=black cterm=reverse
   hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Search ctermfg=black ctermbg=darkblue cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
@@ -365,14 +362,13 @@ if s:t_Co >= 8
   hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
   hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse
-  hi DiffChange ctermfg=black ctermbg=white cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -455,7 +451,7 @@ endif
 " Color: color03          #af875f        137            darkyellow
 " Color: color11          #d7af87        180            yellow
 " Color: color04          #5f87af        67             darkblue
-" Color: color12          #87afd7        110            blue
+" Color: color12          #5fafd7        74             blue
 " Color: color05          #af87af        139            darkmagenta
 " Color: color13          #d787d7        176            magenta
 " Color: color06          #5f8787        66             darkcyan
@@ -470,10 +466,10 @@ endif
 " Color: colorlC          #5fff00        82             green
 " Color: colorV           #1f3f5f        109            cyan
 " Color: colorMP          #ff00af        199            magenta
-" Color: diffAdd          #5f875f        65             darkgreen
-" Color: diffDelete       #af875f        137            darkyellow
-" Color: diffChange       #5f5f5f        59             darkgray
-" Color: diffText         #878787        102            lightgrey
+" Color: diffAdd          #5faf5f        71             darkgreen
+" Color: diffDelete       #af5f5f        131            darkred
+" Color: diffChange       #5f87af        67             darkblue
+" Color: diffText         #af87af        139            darkmagenta
 " Color: black            #000000        16             black
 " Color: white            #dadada        253            white
 " Color: Added            #5fd75f        77             darkgreen