aboutsummaryrefslogtreecommitdiff
path: root/vim/after/indent/vim.vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 09:34:34 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 09:34:34 +1300
commite819f04d4f3106c963315a601de86ef7ce5dbac2 (patch)
treef7aee228694348eef43f809cd9c285b1164734c6 /vim/after/indent/vim.vim
parenta468fd59d6cf18c8f5fc43065adf2f7ee09ba91f (diff)
parent9310f1291c79c4adfb88f03cfa943b88f89bd9ab (diff)
downloaddotfiles-e819f04d4f3106c963315a601de86ef7ce5dbac2.tar.gz
dotfiles-e819f04d4f3106c963315a601de86ef7ce5dbac2.zip
Merge branch 'release/v2.1.0'v2.1.0
* release/v2.1.0: Bump VERSION Remove pre-7.0 Vim handling/boilerplate
Diffstat (limited to 'vim/after/indent/vim.vim')
-rw-r--r--vim/after/indent/vim.vim11
1 files changed, 7 insertions, 4 deletions
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index 548d3e5c..3d439458 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -1,8 +1,11 @@
+" Remove inapplicable defaults from 'indentkeys'
+" Should only need to undo this if the stock plugin didn't
+setlocal indentkeys-=0#,0{,0},0),:
+if !exists('b:undo_indent')
+ let b:undo_indent = '|setlocal indentkeys<'
+endif
+
" Observe VimL conventions for two-space indents
setlocal shiftwidth=2
setlocal softtabstop=2
let b:undo_indent .= '|setlocal shiftwidth< softtabstop<'
-
-" Remove inapplicable defaults from 'indentkeys'
-setlocal indentkeys-=0#,0{,0},0),:
-let b:undo_indent .= '|setlocal indentkeys<'