add tabstop setting

bleything · Oct 27, 2010 · c4da3a4 · c4da3a4
1 parent 37fb631
commit c4da3a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/editing b/editing
@@ -28,12 +28,13 @@ set backspace=indent,eol,start
 " for most code, use 4 space indents. specific filetypes are overridden
 " in filetypes.vimrc
 set softtabstop=4 " most of the time, we want a softtabstop of 4
+set tabstop=4     " display tabs as 4 characters wide
 set shiftwidth=4  " shift by 4 spaces when using >> and <<, etc
 set expandtab     " no tabs, just spaces kthx.
 
 " Using autocmd for this allows it to be reset every time you open a
 " file, which keeps overrides from being persistent
-autocmd FileType * set softtabstop=4 shiftwidth=4 expandtab
+autocmd FileType * set softtabstop=4 tabstop=4 shiftwidth=4 expandtab
 
 set list                     " show whitespace
 set listchars=tab:»·,trail:· " show tabs and trailing spaces

diff --git a/filetypes b/filetypes
@@ -15,7 +15,7 @@
 filetype plugin indent on
 
 " ruby and yaml files are indented by two
-autocmd FileType ruby,rdoc,cucumber,yaml set softtabstop=2 shiftwidth=2
+autocmd FileType ruby,rdoc,cucumber,yaml set softtabstop=2 tabstop=2 shiftwidth=2
 
 " Gemfile, Isolate, Vagrantfile and config.ru are ruby
 autocmd BufNewFile,BufRead Gemfile     setfiletype ruby