Merge branch 'add-editorconfig' into develop

This commit is contained in:
ZyX 2014-05-04 12:12:39 +04:00
commit 5d03fdebe1
2 changed files with 20 additions and 4 deletions

20
.editorconfig Normal file
View File

@ -0,0 +1,20 @@
# editorconfig ini file
# Check out http://editorconfig.org for a list of plugins for different
# IDEs/text editors that support this file. Vim plugin to support this:
#
# http://www.vim.org/scripts/script.php?script_id=3934
# https://github.com/editorconfig/editorconfig-vim
root = true
[*]
end_of_line = lf
insert_final_newline = true
indent_style = tab
# Despite promise somewhere alignment is done only using tabs. Thus setting
# indent_size and tab_width is a requirement.
indent_size = 4
tab_width = 4
charset = utf-8
[*.rst]
indent_style = space

View File

@ -4,9 +4,5 @@
"
" [1]: http://www.vim.org/scripts/script.php?script_id=3393
" [2]: https://github.com/thinca/vim-localrc
setlocal noexpandtab
" Despite promise somewhere alignment is done only using tabs. Thus setting
" &tabstop is a requirement.
setlocal tabstop=4
let g:syntastic_python_flake8_args = '--ignore=W191,E501,E121,E122,E123,E128,E225,W291,E126'
let b:syntastic_checkers = ['flake8']