From a4f725953277308cf4eaca4297cc454016c1aed8 Mon Sep 17 00:00:00 2001
From: Tony Duckles <tony@nynim.org>
Date: Sat, 6 Jan 2018 08:47:09 -0600
Subject: [PATCH] .vimrc: Use autocmd for adding Solarized highlight overrides

Use 'autocmd ColorScheme solarized' to trigger adding the override
'highlight' rules to override default Solarized colorscheme
highlighting.

This ensures that these highlight rules get added when changing the
colorscheme [back] to 'solarized'. This also compartmentalizes these
overrides to the Solarized colorscheme.
---
 .vimrc | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.vimrc b/.vimrc
index 178b4ac..db85961 100644
--- a/.vimrc
+++ b/.vimrc
@@ -156,6 +156,27 @@ if &t_Co > 2 || has("gui_running")
   set background=dark                 " dark background
   syntax enable                       " syntax highligting
 
+  " override colors in solarized colorscheme
+  augroup vimrc_colorscheme_solarized
+    autocmd!
+    if !has("gui_running")
+      " override Normal ctermfg
+      autocmd ColorScheme solarized highlight Normal ctermfg=None
+      " override Comment ctermfg
+      if &t_Co == 256
+        autocmd ColorScheme solarized highlight Comment ctermfg=241
+      else
+        autocmd ColorScheme solarized highlight Comment ctermfg=DarkGrey
+      endif
+      " override visual block
+      autocmd ColorScheme solarized highlight Visual term=reverse cterm=reverse ctermfg=DarkGreen ctermbg=White
+      if &t_Co < 256
+        " override unprintable chars (listchars)
+        autocmd ColorScheme solarized highlight SpecialKey ctermfg=DarkGrey ctermbg=Black
+      endif
+    endif
+  augroup END
+
   let g:solarized_termcolors=&t_Co    " use 256 colors for solarized
   let g:solarized_termtrans=1
   colorscheme solarized
@@ -164,27 +185,6 @@ if &t_Co > 2 || has("gui_running")
   let g:solarized16_termcolors=16     " always use 16 colors for 'solarized16' vim-airline theme
 endif
 
-" ---------------------------------------------------------------------------
-"  Highlight (Colors)
-" ---------------------------------------------------------------------------
-
-if !has("gui_running")
-  " always use terminal's default bg color, override solarized Normal ctermfg
-  highlight Normal ctermbg=None ctermfg=None
-  " override solarized Comment ctermfg
-  if &t_Co == 256
-    highlight Comment ctermfg=241
-  else
-    highlight Comment ctermfg=DarkGrey
-  endif
-  " visual block
-  highlight Visual term=reverse cterm=reverse ctermfg=DarkGreen ctermbg=White
-  if &t_Co < 256
-    " unprintable chars (listchars)
-    highlight SpecialKey ctermfg=DarkGrey ctermbg=Black
-  endif
-endif
-
 " ----------------------------------------------------------------------------
 "  Backups
 " ----------------------------------------------------------------------------
-- 
2.43.0