Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
031f715659
14 changed files with 1954 additions and 112 deletions
13
vimrc
13
vimrc
|
@ -108,6 +108,17 @@ endif
|
|||
set modeline
|
||||
set modelines=12
|
||||
|
||||
" Add my generated system tags files
|
||||
set tags=./tags,tags
|
||||
" These two are the important ones
|
||||
set tags+=~/.tags/apple_frameworks.tags
|
||||
set tags+=~/.tags/usr.tags
|
||||
"set tags+=~/.tags/3rdparty_frameworks.tags
|
||||
" This thing is 853 MB on my last count. It *probably* doesn't need to be
|
||||
" included all the time...
|
||||
"set tags+=~/.tags/usr_local.tags
|
||||
|
||||
|
||||
" use syntax highlighting if the terminal can support it (or we're in a GUI)
|
||||
if &t_Co > 2 || has('gui_running')
|
||||
syntax on " turn on syntax highlighting
|
||||
|
@ -115,6 +126,8 @@ endif
|
|||
|
||||
set bg=dark
|
||||
|
||||
call togglebg#map("<F10>")
|
||||
|
||||
" use solarized colorscheme if the terminal can support it (or we're in a GUI)
|
||||
let g:solarized_termtrans = 1
|
||||
let g:solarized_visibility = 'low'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue