2 files changed, 8 insertions, 13 deletions
diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim
index fd3c99de..78bddd33 100644
--- a/vim/indent/csv.vim
+++ b/vim/indent/csv.vim
@@ -4,8 +4,12 @@ if exists('b:did_indent')
 endif
 let b:did_indent = 1
 
-" Manual indenting and literal tabs for CSVs
+" Manual indenting
 setlocal noautoindent
+let b:undo_indent = 'setlocal autoindent<'
+
+" Literal tabs
 setlocal noexpandtab
 setlocal softtabstop=0
-let b:undo_indent = 'setlocal autoindent< expandtab< softtabstop<'
+let &shiftwidth = &tabstop
+let b:undo_indent = 'setlocal expandtab< softtabstop< shiftwidth<'
diff --git a/vim/indent/tsv.vim b/vim/indent/tsv.vim
index adbde97d..ae72397c 100644
--- a/vim/indent/tsv.vim
+++ b/vim/indent/tsv.vim
@@ -1,11 +1,2 @@
-" Only do this when not done yet for this buffer
-if exists('b:did_indent')
-  finish
-endif
-let b:did_indent = 1
-
-" Manual indenting and literal tabs for TSVs
-setlocal noautoindent
-setlocal noexpandtab
-setlocal softtabstop=0
-let b:undo_indent = 'setlocal autoindent< expandtab< softtabstop<'
+" TSVs have the same indent options as CSVs
+runtime! indent/csv.vim