dotfiles

commit 53f65451bed62bca964212f37b7f4542b0de73cb
parent dc7d43307b71b22ab7d6c794155833c4b1862f49
Author: Chris Bracken <chris@bracken.jp>
Date:   Sun, 11 May 2014 15:32:11 -0700

Improved ColorColumn, CursorLine highlighting

Diffstat:
M
.vim/vimrc
 | 
33
+++++++++++++++++++--------------

1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/.vim/vimrc b/.vim/vimrc
@@ -73,16 +73,29 @@ if &t_Co > 2 || has("gui_running")
   syntax on
   set background=dark
   colorscheme vividchalk
-  if has("gui_macvim")
-    set guifont=Menlo:h11
-  elseif has("unix")
-    set guifont=Source\ Code\ Pro\ 10,Monospace\ 10
-  endif
+  set cursorline
+  hi ColorColumn guibg=grey6 ctermbg=233
+  hi CursorLine guibg=grey6 cterm=NONE ctermbg=233
 
   if has("autocmd")
+    " Cursor line highlighting
+    au WinLeave * setlocal nocursorline
+    au WinEnter * setlocal cursorline
+    au BufLeave * setlocal nocursorline
+    au BufEnter * setlocal cursorline
+
     " Highlight over-length lines
     au BufEnter,InsertLeave * set colorcolumn=80
-    au BufEnter,InsertLeave *.java set colorcolumn=100
+    au BufEnter,InsertLeave * set colorcolumn=80
+
+    " Highlight trailing space
+    au BufEnter,InsertLeave * SpaceHi
+  endif
+
+  if has("gui_macvim")
+    set guifont=Menlo:h11
+  elseif has("unix")
+    set guifont=Source\ Code\ Pro\ 10,Monospace\ 10
   endif
 endif
 
@@ -94,14 +107,6 @@ if has("gui_running")
   set guioptions-=m          " Hide menu bar
   set guioptions+=a          " Better integration with WM selection
 
-  " Cursor line highlighting
-  autocmd WinLeave * setlocal nocursorline
-  autocmd WinEnter * setlocal cursorline
-  autocmd BufLeave * setlocal nocursorline
-  autocmd BufEnter * setlocal cursorline
-  set cursorline
-  hi CursorLine guibg=#333333 cterm=none ctermbg=237
-
   " Menubar toggling
   function! ToggleMenu()
     if &go=~#'m'