diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-08 13:55:18 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-08 13:55:18 +1300 |
commit | 8ddb8ba683cee22f930dd48d85a117ce07be5cac (patch) | |
tree | 47bbb9e862b227d758ebb9643ab23f649c463d8c /vim/indent | |
parent | Merge branch 'hotfix/v0.11.1' (diff) | |
parent | Update dotfiles(7) manual from README.md (diff) | |
download | dotfiles-8ddb8ba683cee22f930dd48d85a117ce07be5cac.tar.gz dotfiles-8ddb8ba683cee22f930dd48d85a117ce07be5cac.zip |
Merge branch 'release/v0.12.0'v0.12.0
* release/v0.12.0:
Update dotfiles(7) manual from README.md
Bump version to 0.12.0
Use "nunmap" not "unmap" for b:undo_* var
Remove null command from b:undo_* variables
Use consistent/thorough ftplugin/indent unloading
Add clustering for POSIX shell syntax groups
Add `kill` as shStatement
Add `break`, `continue`, `return` as shStatement
Override commands and variables for syntax/sh.vim
Disable unwanted shell error syntax for any shell
Break a long conditional in vim/ftdetect/sh.vim
Rename b:check and b:lint with sh_ prefix
Remove overkill defined-and-false check of sh vars
Clear b:check/lint in ftdetect/sh.vim b:undo
Move ftplugin/sh.vim b:undo def to end of file
Use correct undo variable name in ftplugin/sh.vim
Remove superfluous augroups around ftdetect defs
Use sh.vim local vars not global POSIX hacks
Spell-checked and corrected README.md
Diffstat (limited to 'vim/indent')
-rw-r--r-- | vim/indent/csv.vim | 2 | ||||
-rw-r--r-- | vim/indent/tsv.vim | 2 | ||||
-rw-r--r-- | vim/indent/vim.vim | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim index 682bc3a8..ae2b6f6c 100644 --- a/vim/indent/csv.vim +++ b/vim/indent/csv.vim @@ -1,5 +1,7 @@ " Manual indenting and literal tabs for CSVs setlocal noautoindent setlocal noexpandtab + +" Unload this indent plugin let b:undo_user_indent \ = 'setlocal autoindent< expandtab<' diff --git a/vim/indent/tsv.vim b/vim/indent/tsv.vim index 951b3e60..759602ed 100644 --- a/vim/indent/tsv.vim +++ b/vim/indent/tsv.vim @@ -1,5 +1,7 @@ " Manual indenting and literal tabs for TSVs setlocal noautoindent setlocal noexpandtab + +" Unload this indent plugin let b:undo_user_indent \ = 'setlocal autoindent< expandtab<' diff --git a/vim/indent/vim.vim b/vim/indent/vim.vim index 047a353d..138b9205 100644 --- a/vim/indent/vim.vim +++ b/vim/indent/vim.vim @@ -3,9 +3,7 @@ setlocal shiftwidth=2 setlocal softtabstop=2 setlocal tabstop=2 -" Ancient Vim can't use the '<' suffix syntax for resetting local integer -" options -if v:version > 700 - let b:undo_user_indent - \ = 'setlocal shiftwidth< softtabstop< tabstop<' -endif +" Unload this indent plugin; suppress errors because ancient Vim can't use the +" '<' suffix syntax for resetting local integer +let b:undo_user_indent + \ = 'silent! setlocal shiftwidth< softtabstop< tabstop<' |