# HG changeset patch # User Steve Losh # Date 1320240346 14400 # Node ID 4757d3a7cd629193fedf7944ac1e221ec5049913 # Parent 372c5316463ac03b14e5f5b02a7d2fff2ac6db35 Cursorline and diffcolors. diff -r 372c5316463a -r 4757d3a7cd62 vim/.vimrc --- a/vim/.vimrc Sun Oct 30 22:31:49 2011 -0400 +++ b/vim/.vimrc Wed Nov 02 09:25:46 2011 -0400 @@ -40,7 +40,7 @@ set showbreak=↪ set splitbelow set splitright -set fillchars=diff:\ +set fillchars=diff:⣿ set ttimeout set notimeout set nottimeout @@ -514,6 +514,16 @@ augroup END " }}} +" Java {{{ + +augroup ft_java + au! + + au FileType java setlocal foldmethod=marker + au FileType java setlocal foldmarker={,} +augroup END + +" }}} " Javascript {{{ augroup ft_javascript @@ -1471,39 +1481,31 @@ let old_hi = split(old_hi, '\n')[0] let old_hi = substitute(old_hi, 'xxx', '', '') - hi CursorLine guibg=#2a2a2a + hi CursorLine guibg=#2a2a2a ctermbg=233 redraw sleep 20m - hi CursorLine guibg=#333333 + hi CursorLine guibg=#333333 ctermbg=235 redraw sleep 20m - hi CursorLine guibg=#3a3a3a - redraw - sleep 20m - - hi CursorLine guibg=#444444 + hi CursorLine guibg=#3a3a3a ctermbg=237 redraw sleep 20m - hi CursorLine guibg=#4a4a4a - redraw - sleep 20m - - hi CursorLine guibg=#444444 + hi CursorLine guibg=#444444 ctermbg=239 redraw sleep 20m - hi CursorLine guibg=#3a3a3a + hi CursorLine guibg=#3a3a3a ctermbg=237 redraw sleep 20m - hi CursorLine guibg=#333333 + hi CursorLine guibg=#333333 ctermbg=235 redraw sleep 20m - hi CursorLine guibg=#2a2a2a + hi CursorLine guibg=#2a2a2a ctermbg=233 redraw sleep 20m diff -r 372c5316463a -r 4757d3a7cd62 vim/colors/molokai.vim --- a/vim/colors/molokai.vim Sun Oct 30 22:31:49 2011 -0400 +++ b/vim/colors/molokai.vim Wed Nov 02 09:25:46 2011 -0400 @@ -41,9 +41,9 @@ hi Identifier guifg=#FD971F " }}} " Diffs {{{ -hi DiffAdd guibg=#0F1D0B +hi DiffAdd guibg=#1e4313 hi DiffChange guifg=#89807D guibg=#322F2D -hi DiffDelete guifg=#960050 guibg=#1E0010 +hi DiffDelete guifg=#ff0088 guibg=#1B1E1F hi DiffText guibg=#4A4340 gui=italic,bold " }}} " Cursor {{{