Merge changes from origin/master
Update vimrc
This commit is contained in:
parent
c24d310f2e
commit
cc8e0fe12c
1 changed files with 3 additions and 4 deletions
7
vimrc
7
vimrc
|
@ -107,13 +107,12 @@ endif
|
||||||
" use solarized colorscheme if the terminal can support it (or we're in a GUI)
|
" use solarized colorscheme if the terminal can support it (or we're in a GUI)
|
||||||
let g:solarized_termtrans=1
|
let g:solarized_termtrans=1
|
||||||
let g:solarized_visibility='low'
|
let g:solarized_visibility='low'
|
||||||
if has('gui_running')
|
if has('gui')
|
||||||
set bg=light
|
set bg=light
|
||||||
colorscheme solarized
|
|
||||||
else
|
else
|
||||||
set bg=dark
|
set bg=dark
|
||||||
colorscheme solarized
|
|
||||||
endif
|
endif
|
||||||
|
colorscheme solarized
|
||||||
|
|
||||||
" tell SnipMate who I am
|
" tell SnipMate who I am
|
||||||
let g:snips_author = 'Eryn Wells <eryn@erynwells.me>'
|
let g:snips_author = 'Eryn Wells <eryn@erynwells.me>'
|
||||||
|
@ -134,7 +133,7 @@ if has('gui_running')
|
||||||
set guifont=Inconsolata\ 14
|
set guifont=Inconsolata\ 14
|
||||||
endif
|
endif
|
||||||
set guioptions-=T " turn off toolbar
|
set guioptions-=T " turn off toolbar
|
||||||
set guioptions-=m " turn off toolbar
|
set guioptions-=m " turn off menubar
|
||||||
endif
|
endif
|
||||||
|
|
||||||
nmap <F3> :GundoToggle<CR>
|
nmap <F3> :GundoToggle<CR>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue