Commit 41b229ad authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'feature/vim-python-ide'

parents 30ed3938 b344ff36

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -22,3 +22,6 @@ 
[submodule ".oh-my-zsh"]

	path = .oh-my-zsh

	url = git://github.com/robbyrussell/oh-my-zsh.git

[submodule ".vim/bundle/simply-fold"]

	path = .vim/bundle/simply-fold

	url = https://github.com/tmhedberg/SimpylFold.git

.shell/funcs

+2 −3
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ get_shell() 


update_submodules()

{

	git submodule init

	git submodule sync

	git submodule update

	git submodule sync --recursive

	git submodule update --init --recursive



	# do not attempt automatic upgrading if not on master branch

	if [ master != `get_branch` ]; then

.vim/after/ftplugin/python.vim

+6 −2
Original line number Diff line number Diff line 
setlocal noexpandtab

setlocal sw=4 ts=4 sts=0
 
set noexpandtab

set sw=4 ts=4 sts=0

set foldmethod=indent

set foldlevel=99



let g:SimplyFold_docstring_preview = 1

simply-fold @ e7352b65

Original line number Diff line number Diff line 
Subproject commit e7352b65e8b41b90b9000507687f12e631661105

.vimrc

+11 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ if has("syntax") 
endif





" === COMPLETION ===



" Close completion box automatically

let g:ycm_autoclose_preview_window_after_completion=1





" === INVLIST ===



" Show tabs with •◦◦◦
@@ -84,6 +90,11 @@ set listchars+=tab:•◦ 
nmap <silent>tl :set invlist<CR>





" === FOLDING ===



" Use space for toggling folds

nnoremap <space> za





" === HIGH-LIGHTING ===