fergalmoran/vimfiles
1
0
Fork 0
mirror of https://github.com/fergalmoran/vimfiles.git synced 2025-12-26 03:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2014-06-18 19:02:39 +01:00
parent 90d6d6efa0 d50c495213
commit b0453613a4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.vimrc
View File

@@ -90,6 +90,11 @@ set wildignore+=*_build/*
let g:syntastic_always_populate_loc_list = 0 let g:syntastic_always_populate_loc_list = 0
let g:syntastic_auto_loc_list = 0 let g:syntastic_auto_loc_list = 0
" Sane Ignore For ctrlp
let g:ctrlp_custom_ignore = {
\ 'dir': '\.git$\|\.hg$\|\.svn$\|\.yardoc\|node_modules|public\/images\|public\/system\|data\|log\|tmp$',
\ 'file': '\.exe$\|\.so$\|\.dat$'
\ }
Bundle 'https://github.com/klen/python-mode.git' Bundle 'https://github.com/klen/python-mode.git'
map <Leader>g :call RopeGotoDefinition()<CR> map <Leader>g :call RopeGotoDefinition()<CR>
let ropevim_enable_shortcuts = 1 let ropevim_enable_shortcuts = 1
@@ -171,7 +176,7 @@ set formatoptions+=2 " Use indent from 2nd line of a paragraph
set formatoptions+=l " Don't break lines that are already long set formatoptions+=l " Don't break lines that are already long
set formatoptions+=1 " Break before 1-letter words set formatoptions+=1 " Break before 1-letter words
colorscheme badwolf colorscheme elflord
syntax enable syntax enable
filetype plugin indent on filetype plugin indent on