summaryrefslogtreecommitdiff
path: root/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vimrc')
-rw-r--r--vimrc12
1 files changed, 7 insertions, 5 deletions
diff --git a/vimrc b/vimrc
index bc42f7c..57a2a76 100644
--- a/vimrc
+++ b/vimrc
@@ -8,7 +8,7 @@ colorscheme inkpot
filetype on
syntax on
-filetype plugin on
+filetype plugin indent on
set wrap
set nocompatible
@@ -20,9 +20,11 @@ set showcmd
set ttyfast
set autoindent
-set smartindent
set shiftwidth=4
+set softtabstop=4
set tabstop=4
+"set textwidth=79
+set cinoptions=(s,U1
set ignorecase
set incsearch
@@ -31,6 +33,6 @@ set scrolloff=4
set foldenable
-autocmd FileType haml setlocal expandtab tabstop=2 shiftwidth=2
-autocmd FileType ruby setlocal expandtab tabstop=2 shiftwidth=2 textwidth=79
-autocmd FileType sh setlocal expandtab
+autocmd FileType haml setlocal sw=2 sts=2 ts=2 et
+autocmd FileType ruby setlocal sw=2 sts=2 ts=2 et
+autocmd FileType sh setlocal et