Re-organise the config file

This commit is contained in:
Anthony Rose 2017-04-10 13:14:39 +01:00
parent 17fc7abc5e
commit 372153819d

38
vimrc
View file

@ -5,9 +5,9 @@
" Includes parts from Tim Pope's «sensible.vim» " Includes parts from Tim Pope's «sensible.vim»
" <https://github.com/tpope/vim-sensible>. " <https://github.com/tpope/vim-sensible>.
if version < 800 if version < 800 && has("eval")
silent! runtime pack/acp/opt/vim-pathogen/autoload/pathogen.vim runtime pack/acp/opt/vim-pathogen/autoload/pathogen.vim
silent! execute pathogen#infect('pack/acp/start/{}') execute pathogen#infect('pack/acp/start/{}')
endif endif
inoremap <down> <nop> inoremap <down> <nop>
@ -68,6 +68,7 @@ set wrap
if has("eval") if has("eval")
autocmd BufRead,BufNewFile *.md set filetype=markdown autocmd BufRead,BufNewFile *.md set filetype=markdown
colorscheme jellybeans
command Q q command Q q
command W w command W w
command WQ wq command WQ wq
@ -85,6 +86,18 @@ if has("eval")
syntax on syntax on
endif endif
if &t_Co == 8 && $TERM !~# '^linux\|^Eterm'
set t_Co=16
endif
if has("folding")
set nofoldenable
endif
if has("lua")
let g:neocomplete#enable_at_startup=1
endif
if has("patch-7.3.541") if has("patch-7.3.541")
set formatoptions+=j set formatoptions+=j
endif endif
@ -95,18 +108,6 @@ else
set listchars=eol,tab:→ ,trail:~,extends:>,precedes:< set listchars=eol,tab:→ ,trail:~,extends:>,precedes:<
endif endif
if has("lua")
let g:neocomplete#enable_at_startup=1
endif
if has("folding")
set nofoldenable
endif
if &t_Co == 8 && $TERM !~# '^linux\|^Eterm'
set t_Co=16
endif
if has("gui_running") if has("gui_running")
if has("gui_gtk2") if has("gui_gtk2")
set guifont=Monospace\ Regular\ 10 set guifont=Monospace\ Regular\ 10
@ -115,16 +116,9 @@ if has("gui_running")
set guifont=Consolas:h10:cANSI set guifont=Consolas:h10:cANSI
set clipboard=unnamed set clipboard=unnamed
endif endif
set columns=88 set columns=88
set lines=40 set lines=40
try
colorscheme jellybeans
catch /^Vim\%((\a\+)\)\=:E185/
colorscheme darkblue
endtry
endif endif
" vim:set ft=vim et sw=4: " vim:set ft=vim et sw=4: