@ -182,6 +182,9 @@ let g:pymode_folding = 0
" set pydoc key
let g:pymode_doc_key = 'K'
" Disable auto python-mode autocomplete documentation window
set completeopt=menu
" Merlin for OCaml
let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
execute "set rtp+=" . g:opamshare . "/merlin/vim"
@ -38,7 +38,7 @@ alias gf='git fetch'
alias ga='git add .'
gblame() {
git blame $1
builtin git blame $1
}
parse_git_branch() {