From ffdd2a9ab97397437a0a15c1433484ef4ea8cfe2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 22 Jun 2019 00:39:05 +1200 Subject: Clean up Vim indent settings a bit --- vim/indent/csv.vim | 9 ++++++--- vim/indent/help.vim | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'vim/indent') diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim index 78bddd33..a9aba056 100644 --- a/vim/indent/csv.vim +++ b/vim/indent/csv.vim @@ -10,6 +10,9 @@ let b:undo_indent = 'setlocal autoindent<' " Literal tabs setlocal noexpandtab -setlocal softtabstop=0 -let &shiftwidth = &tabstop -let b:undo_indent = 'setlocal expandtab< softtabstop< shiftwidth<' +setlocal shiftwidth=0 +let b:undo_indent = 'setlocal expandtab< shiftwidth<' +if &softtabstop != -1 + let &l:softtabstop = &l:shiftwidth + let b:undo_indent .= '|setlocal softtabstop<' +endif diff --git a/vim/indent/help.vim b/vim/indent/help.vim index 1edf64fb..c49e1ced 100644 --- a/vim/indent/help.vim +++ b/vim/indent/help.vim @@ -5,8 +5,10 @@ endif let b:did_indent = 1 " Use hard tabs for editing Vim help files -setlocal noexpandtab shiftwidth=0 tabstop=8 +setlocal noexpandtab +setlocal shiftwidth=0 +let b:undo_indent = 'setlocal expandtab< shiftwidth<' if &softtabstop != -1 let &softtabstop = &shiftwidth + let b:undo_indent = 'setlocal softtabstop<' endif -let b:undo_indent = 'setlocal expandtab< shiftwidth< softtabstop< tabstop<' -- cgit v1.2.3