diff --git a/.vimrc b/.vimrc index 8980f696..f26e697f 100644 --- a/.vimrc +++ b/.vimrc @@ -11,12 +11,13 @@ set list syntax on if &diff - syntax off + syntax off endif -filetype plugin indent on +set expandtab set autoindent set smartindent +filetype plugin indent on noremap noremap diff --git a/after/ftplugin/fortran.vim b/after/ftplugin/fortran.vim deleted file mode 100644 index 5245bdc5..00000000 --- a/after/ftplugin/fortran.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal expandtab diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim new file mode 100644 index 00000000..50344e5c --- /dev/null +++ b/after/ftplugin/markdown.vim @@ -0,0 +1,2 @@ +setlocal shiftwidth=2 +setlocal softtabstop=2 diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim index 3cac491d..6f530401 100644 --- a/after/ftplugin/python.vim +++ b/after/ftplugin/python.vim @@ -1,4 +1,2 @@ -setlocal tabstop=4 setlocal shiftwidth=4 setlocal softtabstop=4 -setlocal expandtab diff --git a/after/ftplugin/sh.vim b/after/ftplugin/sh.vim index 5261b5ef..50344e5c 100644 --- a/after/ftplugin/sh.vim +++ b/after/ftplugin/sh.vim @@ -1,4 +1,2 @@ -setlocal tabstop=2 setlocal shiftwidth=2 setlocal softtabstop=2 -setlocal expandtab