diff --git a/vimrc b/vimrc index 45b6ce9..2befdba 100644 --- a/vimrc +++ b/vimrc @@ -50,6 +50,7 @@ if has("unix") || has("mac") Plugin 'klen/python-mode' let g:pymode_rope_lookup_project = 0 let g:pymode_rope = 0 + Plugin 'davidhalter/jedi-vim' endif if has("ruby") Plugin 'terryma/vim-multiple-cursors' @@ -70,7 +71,6 @@ if has("unix") || has("mac") Plugin 'tikhomirov/vim-glsl' Plugin 'mzlogin/vim-smali' Plugin 'jamessan/vim-gnupg' - Plugin 'davidhalter/jedi-vim' Plugin 'petRUShka/vim-opencl' Plugin 'Raimondi/delimitMate' Plugin 'tpope/vim-surround' @@ -298,12 +298,12 @@ language messages POSIX set title "[Hide/show the white-space and more invisible symbols]" set list -set listchars=tab:\|\ ,trail:- +set listchars=nbsp:¬,tab:\|\ ,trail:- set nojoinspaces "[Folding settings]" set foldenable set foldclose="" -set foldcolumn=1 +set foldcolumn=0 set foldlevel=10 set foldlevelstart=10 set foldmethod=indent @@ -334,7 +334,7 @@ set nolinebreak set encoding=utf-8 set termencoding=utf-8 set fileencoding=utf-8 -set fileencodings=utf-8,cp1251,koi8-r +set fileencodings=utf-8,latin1,cp1251,koi8-r "[Use UNIX, DOS, MAC FileType]" set fileformat=unix set fileformats=unix,mac,dos