aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vim/config/whitespace.vim4
-rw-r--r--vim/indent/csv.vim3
-rw-r--r--vim/indent/tsv.vim3
3 files changed, 4 insertions, 6 deletions
diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim
index 0d985f15..99974cb1 100644
--- a/vim/config/whitespace.vim
+++ b/vim/config/whitespace.vim
@@ -10,10 +10,6 @@ set shiftwidth=4
" Insert four spaces when Tab is pressed
set softtabstop=4
-" Indent intelligently to 'shiftwidth' at the starts of lines with Tab, but
-" use 'tabstop' everywhere else
-set smarttab
-
" When indenting lines with < or >, round the indent to a multiple of
" 'shiftwidth', so even if the line is indented by one space it will indent
" up to 4 and down to 0, for example
diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim
index 938bc99d..fd3c99de 100644
--- a/vim/indent/csv.vim
+++ b/vim/indent/csv.vim
@@ -7,4 +7,5 @@ let b:did_indent = 1
" Manual indenting and literal tabs for CSVs
setlocal noautoindent
setlocal noexpandtab
-let b:undo_indent = 'setlocal autoindent< expandtab<'
+setlocal softtabstop=0
+let b:undo_indent = 'setlocal autoindent< expandtab< softtabstop<'
diff --git a/vim/indent/tsv.vim b/vim/indent/tsv.vim
index 6f70276d..adbde97d 100644
--- a/vim/indent/tsv.vim
+++ b/vim/indent/tsv.vim
@@ -7,4 +7,5 @@ let b:did_indent = 1
" Manual indenting and literal tabs for TSVs
setlocal noautoindent
setlocal noexpandtab
-let b:undo_indent = 'setlocal autoindent< expandtab<'
+setlocal softtabstop=0
+let b:undo_indent = 'setlocal autoindent< expandtab< softtabstop<'