vimrc: update tabstop settings

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index ecb9f004faa9463fb45525d6643331f657fba8f1..10dd903ac3aaf3cb1c7d20fa2bab2386ddae0ee0 100644 (file)
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -19,9 +19,8 @@ syntax on
 filetype plugin indent on
 
 set modeline
-set autoindent
 set number
-set bs=2
+set backspace=indent,eol,start
 
 "vim-7 and newer has vimspell (spell checker) built in
 if version >= 703
@@ -58,9 +57,11 @@ highlight BadWhitespace ctermbg=red guibg=red
 " Make trailing whitespace be flagged as bad.
 au Filetype python,tex,c,cpp,cs,objc,java syn match BadWhitespace /\s\+$/ containedin=ALL
 
-" set list to activate 
 set listchars=tab:»­,trail:·,eol:$
 
+
+set autoindent
+set tabstop=4
 au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent
 "let g:detectindent_preferred_expandtab = 1
 "let g:detectindent_preferred_indent = 4
@@ -105,7 +106,6 @@ au Filetype c,cpp,cs,objc,java set cindent cst csto=0
 au Filetype c,cpp,cs,objc map <F7> :make <CR>
 au Filetype java map <F7> :!ant -f ../build.xml <CR>
 au Filetype c,cpp,cs,obj set makeprg=make
-au Filetype c,cpp,cs,obj set tabstop=4
 au Filetype c,cpp,cs,obj set shiftwidth=4
 
 
@@ -219,7 +219,6 @@ let g:LatexBox_latexmk_options="-pvc"
 
 au Filetype tex set smartindent
 
-au Filetype tex set tabstop=4
 au Filetype tex set shiftwidth=4
 
 au Filetype tex map! ,b \begin{}<Esc>i
@@ -247,7 +246,6 @@ au Filetype python map <F5> :!python % <CR>
 
 " Number of spaces that a pre-existing tab is equal to.
 " For the amount of space used for a new tab use shiftwidth.
-au Filetype python set tabstop=4
 au Filetype python set shiftwidth=4
 au Filetype python set expandtab