1 files changed, 13 insertions, 9 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 5eb139dd..6b85ea37 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,21 +27,25 @@ if has('syntax')
     syntax enable
   endif
 
-  " Use my colorscheme if using the GUI or if we have 256 colors
-  if has('gui_running') || &t_Co >= 256
-    silent! colorscheme sahara
-  endif
+  " Colorscheme handling
+  try
+
+    " Use sahara.vim colorscheme, if using gVim or a 256-color term
+    if has('gui_running') || &t_Co >= 256
+      colorscheme sahara
+    else
+      throw 'Not loading sahara on this terminal'
+    endif
 
-  " If my colorscheme loaded, turn on subtle 'cursorline' coloring
-  if exists('colors_name') && colors_name ==# 'sahara'
+    " Use the colorscheme's subtle 'cursorline', if it loaded
     if exists('+cursorline')
       set cursorline
     endif
 
-  " If it didn't load, default to default scheme with dark background
-  else
+  " Otherwise, use the default colorscheme with a dark background
+  catch
     set background=dark
-  endif
+  endtry
 
 endif