From 86350a58f83617bf68c7121b77ca009e3a21e615 Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Thu, 3 Jul 2014 17:11:41 -0400
Subject: [PATCH] If you don't use a solarized terminal, you have to set
 g:yadr_using_unsolarized_terminal now [Ref #487]

---
 vim/settings/solarized.vim       |  4 ----
 vim/settings/yadr-appearance.vim | 11 ++++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/vim/settings/solarized.vim b/vim/settings/solarized.vim
index 5fd1742..a79a029 100644
--- a/vim/settings/solarized.vim
+++ b/vim/settings/solarized.vim
@@ -1,7 +1,3 @@
-if !has("gui_macvim")
-  set t_Co=256
-endif
-
 if !exists("g:yadr_disable_solarized_enhancements")
   hi! link txtBold Identifier
   hi! link zshVariableDef Identifier
diff --git a/vim/settings/yadr-appearance.vim b/vim/settings/yadr-appearance.vim
index 563db85..ccf0ab5 100644
--- a/vim/settings/yadr-appearance.vim
+++ b/vim/settings/yadr-appearance.vim
@@ -18,13 +18,14 @@ if has("gui_running")
     set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
   end
 else
-  "dont load csapprox if we no gui support - silences an annoying warning
   let g:CSApprox_loaded = 1
-  let g:solarized_termcolors=256
-  let g:solarized_termtrans=1
+
+  " For people using a terminal that is not Solarized
+  if exists("g:yadr_using_unsolarized_terminal")
+    let g:solarized_termcolors=256
+    let g:solarized_termtrans=1
+  end
 endif
 
-" http://ethanschoonover.com/solarized/vim-colors-solarized
 colorscheme solarized
 set background=dark
-