about summary refs log tree commit diff
path: root/vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim')
-rw-r--r--vim/.vim/ftplugin/cpp.vim3
-rw-r--r--vim/.vim/ftplugin/markdown.vim4
-rwxr-xr-xvim/.vim/ftplugin/python/python.vim6
-rwxr-xr-xvim/.vim/vimrc13
4 files changed, 15 insertions, 11 deletions
diff --git a/vim/.vim/ftplugin/cpp.vim b/vim/.vim/ftplugin/cpp.vim
new file mode 100644
index 0000000..2f6ffc8
--- /dev/null
+++ b/vim/.vim/ftplugin/cpp.vim
@@ -0,0 +1,3 @@
+" GNU Coding Standards
+setlocal cindent
+setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
diff --git a/vim/.vim/ftplugin/markdown.vim b/vim/.vim/ftplugin/markdown.vim
new file mode 100644
index 0000000..6cbbf03
--- /dev/null
+++ b/vim/.vim/ftplugin/markdown.vim
@@ -0,0 +1,4 @@
+setlocal shiftwidth=4
+inoremap <M-,> ≤
+inoremap <M-.> ≥
+inoremap ... …
diff --git a/vim/.vim/ftplugin/python/python.vim b/vim/.vim/ftplugin/python/python.vim
new file mode 100755
index 0000000..dc4ed52
--- /dev/null
+++ b/vim/.vim/ftplugin/python/python.vim
@@ -0,0 +1,6 @@
+let g:jedi#popup_on_dot = 0
+let g:jedi#popup_select_first = 0
+let g:jedi#show_call_signatures = 2
+let g:jedi#smart_auto_mappings = 0
+setlocal shiftwidth=4
+syntax keyword pythonBoolean False True None
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index efb300d..8b61c9a 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -13,18 +13,9 @@ set tabstop=8 expandtab shiftwidth=2 softtabstop=-1 smarttab
 set dictionary=/usr/share/dict/words
 set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1
 set omnifunc=syntaxcomplete#Complete
-let g:jedi#popup_on_dot = 0
-let g:jedi#popup_select_first = 0
-let g:jedi#show_call_signatures = 2
-let g:jedi#smart_auto_mappings = 0
 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
-autocmd FileType c,h,go setlocal noexpandtab shiftwidth=8
-autocmd FileType cpp setlocal cinoptions={s}s
+autocmd FileType c,h,go setlocal cindent 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 FileType css,javascript setlocal shiftwidth=4
 autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
 map Q gq
-inoremap <M-,> ≤
-inoremap <M-.> ≥
-inoremap ... …