comparison vim/vimrc @ 271:a1eb5cb340e6

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 24 Jan 2015 18:35:06 -0800
parents faa1f3bf14f6
children 8d04d41d4903
comparison
equal deleted inserted replaced
270:386588661868 271:a1eb5cb340e6
190 if has('gui_running') 190 if has('gui_running')
191 set background=dark 191 set background=dark
192 else 192 else
193 set background=dark 193 set background=dark
194 let g:solarized_termcolors = 256 194 let g:solarized_termcolors = 256
195 "let g:solarized_termtrans = 1 195 let g:solarized_termtrans = 1
196 endif 196 endif
197 colorscheme solarized 197 colorscheme solarized
198 198
199 " Enable file type detection. 199 " Enable file type detection.
200 filetype indent plugin on 200 filetype indent plugin on