aboutsummaryrefslogtreecommitdiff
path: root/vim/after/indent
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
commit94816757caac0120df020ea281a8ab020256de21 (patch)
tree854ae7eb90e67c9d24382018da2594cc9966f840 /vim/after/indent
parentffc11a076b7bb0ce7ac936085a904eb35603fdac (diff)
parent6805bb4d1233fcb7f1ddfb2ff03e12b1f6f0f750 (diff)
downloaddotfiles-94816757caac0120df020ea281a8ab020256de21.tar.gz
dotfiles-94816757caac0120df020ea281a8ab020256de21.zip
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0: Update make_target.vim to v1.2.0 Comment conditional set of <Plug>(InsertCancel) Require Vim 7 for filetype and syntax highlights Simplify a load guard for sh.vim syntax tweaks Clear away a flag after HTML indent load Remove some Vim syntax boilerplate Pare down after/indent scripts a fair bit Remove some overzealous b:undo_* setting Add missing detail to a comment Remove double-key mapping shortcuts Remove boilerplate after/ftplugin load guards Simplify after/ftplugin for C Set b:did_ftplugin flag in Vim ftplugins Adjust a vimrc comment for clarity Simplify ft=sh subtype flag clearing Add dummy function for HTML omnicompletion Clear away stock ft=mail quoting maps Wrap autocmd! clear for ft=mail in :execute Add timestamp augroup clearing to Vim ft=html Abbreviate Vim ft=html autocmd clearing Restore value of 'colorcolumn' after ft=gitcommit Wrap Vim gitcommit autocmd clear in :execute
Diffstat (limited to 'vim/after/indent')
-rw-r--r--vim/after/indent/awk.vim7
-rw-r--r--vim/after/indent/html.vim6
-rw-r--r--vim/after/indent/perl.vim9
-rw-r--r--vim/after/indent/vim.vim20
4 files changed, 8 insertions, 34 deletions
diff --git a/vim/after/indent/awk.vim b/vim/after/indent/awk.vim
deleted file mode 100644
index fc848d2a..00000000
--- a/vim/after/indent/awk.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" The stock AWK indenting is decent, but doesn't include an undo variable;
-" this adds one, clearing away the sole global function too.
-if !exists('b:undo_indent')
- let b:undo_indent = 'unlet! b:did_indent'
- let b:undo_indent = b:undo_indent . '|setlocal indentexpr< indentkeys<'
- let b:undo_indent = b:undo_indent . '|delfunction! GetAwkIndent'
-endif
diff --git a/vim/after/indent/html.vim b/vim/after/indent/html.vim
index 6eae00ac..0309881c 100644
--- a/vim/after/indent/html.vim
+++ b/vim/after/indent/html.vim
@@ -1,4 +1,6 @@
+" Clear away the flag we set to indent after paragraphs
+unlet g:html_indent_inctags
+
" Don't re-indent lines on right-angle-bracket or enter
-setlocal indentkeys-=<>>
-setlocal indentkeys-=<Return>
+setlocal indentkeys-=<>>,<Return>
let b:undo_ftplugin .= '|setlocal indentkeys<'
diff --git a/vim/after/indent/perl.vim b/vim/after/indent/perl.vim
deleted file mode 100644
index 6f97d979..00000000
--- a/vim/after/indent/perl.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-" The stock Perl indenting is decent, but doesn't include an undo variable;
-" this adds one
-if !exists('b:undo_indent')
- let b:undo_indent = 'unlet! b:did_indent'
- let b:undo_indent = b:undo_indent . '|setlocal indentexpr< indentkeys<'
- let b:undo_indent = b:undo_indent . '|unlet! b:indent_use_syntax'
- let b:undo_indent = b:undo_indent . '|unlet! b:match_skip'
- let b:undo_indent = b:undo_indent . '|unlet! b:match_words'
-endif
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index 7e36c4cc..548d3e5c 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -1,20 +1,8 @@
" Observe VimL conventions for two-space indents
setlocal shiftwidth=2
-if v:version > 703 || v:version == 703 && has('patch693')
- setlocal softtabstop=-1
-else
- setlocal softtabstop=2
-endif
+setlocal softtabstop=2
+let b:undo_indent .= '|setlocal shiftwidth< softtabstop<'
" Remove inapplicable defaults from 'indentkeys'
-setlocal indentkeys-=0#
-setlocal indentkeys-=0{
-setlocal indentkeys-=0}
-setlocal indentkeys-=0)
-setlocal indentkeys-=:
-
-" Commands to undo the above
-if exists('b:undo_indent')
- let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<'
- let b:undo_indent = b:undo_indent . '|setlocal softtabstop<'
-endif
+setlocal indentkeys-=0#,0{,0},0),:
+let b:undo_indent .= '|setlocal indentkeys<'