Merge branch 'release/v6.2.0'v6.2.0

* release/v6.2.0: (22 commits)
  Spruce up CSV and TSV Vim filetype scripts
  Add explanatory comment on Vim indent ftplugin
  Remove unneeded password filetype
  Use tabs for Git configuration files
  Fix layout of vim-keep-position submodule config
  Replace and refactor Vim paste plugins
  Move autocmd definitions out of augroup block
  Refactor colorscheme select with cursorline hooks
  Restore Git diff.algorithm to 'patience'
  Tweak a comment about jetpack mapping
  Add Vim leader maps for :command and :function
  Add -bar attribute to :AddLocalSpellFile command
  Add missing b:undo_ftplugin commands for ft=mail
  Remove resolved issue from ISSUES.md list
  Wrap mail quote cleanup in command-func
  Move to body text correctly for start guesser
  Wrap mail starting point guesser in command-func
  Use more idiomatic check for empty string
  Ensure we're in body text before breaking quotes
  ...

1 files changed, 6 insertions, 2 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<'