From fb2b8f82bb3fc999191b0a225cccc2c15c8284ea Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 6 Jul 2018 09:22:52 +1200 Subject: Rearrange Vim's VimL indent file --- vim/after/indent/vim.vim | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'vim/after/indent') diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim index dd5f4f32..73b4e430 100644 --- a/vim/after/indent/vim.vim +++ b/vim/after/indent/vim.vim @@ -1,13 +1,14 @@ " Observe VimL conventions for two-space indents setlocal shiftwidth=2 -if exists('b:undo_indent') - let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<' +if v:version > 703 || v:version == 703 && has('patch693') + setlocal softtabstop=-1 +else + setlocal softtabstop=2 endif -" If we need to set 'softtabstop' too, do it -if &softtabstop != -1 - setlocal softtabstop=2 - if exists('b:undo_indent') - let b:undo_indent = b:undo_indent . '|setlocal softtabstop<' - endif +" Commands to undo the above +if exists('b:undo_indent') + let b:undo_indent = b:undo_indent + \ . '|setlocal shiftwidth<' + \ . '|setlocal softtabstop<' endif -- cgit v1.2.3