Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mjw/dotvim
Browse files Browse the repository at this point in the history
  • Loading branch information
mjw committed Sep 17, 2012
2 parents 9c2cd85 + fad3a6d commit 087b039
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 337 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Expand Up @@ -31,9 +31,6 @@
[submodule "bundle/gundo"]
path = bundle/gundo
url = git://github.com/sjl/gundo.vim.git
[submodule "bundle/jslint"]
path = bundle/jslint
url = git://github.com/hallettj/jslint.vim.git
[submodule "bundle/jekyll"]
path = bundle/jekyll
url = git://github.com/csexton/jekyll.vim.git
Expand Down Expand Up @@ -70,3 +67,6 @@
[submodule "bundle/vim-slime"]
path = bundle/vim-slime
url = git://github.com/jpalardy/vim-slime.git
[submodule "bundle/syntastic"]
path = bundle/syntastic
url = https://github.com/scrooloose/syntastic.git
1 change: 0 additions & 1 deletion bundle/jslint
Submodule jslint deleted from 470658
327 changes: 0 additions & 327 deletions bundle/pylint/compiler/pylint.vim

This file was deleted.

1 change: 1 addition & 0 deletions bundle/syntastic
Submodule syntastic added at 70f835
7 changes: 1 addition & 6 deletions vimrc
Expand Up @@ -23,7 +23,7 @@ call add(g:pathogen_disabled, 'perforce')

let P4ENABLE=expand("~/.p4enable")
if filereadable(P4ENABLE)
call remove(g:pathogen_disabled, 'perforce')
call remove(g:pathogen_disabled, 'perforce')
endif

call pathogen#infect()
Expand Down Expand Up @@ -86,11 +86,6 @@ syntax on

set tags=./tags;/

"Auto lint check python files
autocmd FileType python compiler pylint
"but dont auto open quickfix window
let g:pylint_cwindow = 0

"Toggle nerdtree with nt
nnoremap <leader>nt :NERDTreeToggle<cr>
nnoremap <leader>nf :NERDTreeFind<cr>
Expand Down

0 comments on commit 087b039

Please sign in to comment.