about summary refs log tree commit diff
path: root/vim/.vim/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/.vim/vimrc')
-rwxr-xr-xvim/.vim/vimrc16
1 files changed, 6 insertions, 10 deletions
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index cb912e7..f9d1e10 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -11,20 +11,16 @@ set showcmd
 set nostartofline
 set ruler
 set confirm
-set list
-if has("patch-7.4.710") && has("gui_running")
-  set listchars+=space:·,tab:\ \ 
-else
-  set listchars+=tab:├─
-endif
-set tabstop=8 expandtab shiftwidth=2 softtabstop=2 smarttab
+set list listchars+=tab:├─
+set tabstop=8 expandtab shiftwidth=2 softtabstop=-1 smarttab
 set omnifunc=syntaxcomplete#Complete
 set dictionary=/usr/share/dict/words
 set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1
 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
-autocmd FileType c,h,cpp,arduino setlocal noexpandtab shiftwidth=8 tabstop=8
-autocmd FileType rst setlocal shiftwidth=3 tabstop=3
-autocmd FileType css,javascript,markdown,python setlocal shiftwidth=4 tabstop=4
+autocmd FileType c,h,cpp,arduino setlocal noexpandtab shiftwidth=8
+autocmd FileType rst setlocal shiftwidth=3
+autocmd FileType css,javascript,markdown,python setlocal shiftwidth=4
 autocmd FileType python syntax keyword pythonBoolean False True None
 autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
+let g:jedi#popup_select_first = 0
 map Q gq