diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-21 23:39:36 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-21 23:39:36 +1300 |
| commit | 680c5b2b58db2d6fea59de3443e38aa3dffe0914 (patch) | |
| tree | f9ec628dab5549e5a996fce55428624e93a75b81 /vim/after | |
| parent | Merge branch 'release/v0.24.0' (diff) | |
| parent | Bump version number to 0.25.0 (diff) | |
| download | dotfiles-0.25.0.tar.gz (sig) dotfiles-0.25.0.zip | |
Merge branch 'release/v0.25.0'v0.25.0
* release/v0.25.0:
Bump version number to 0.25.0
Suspend 'C' from 'cpoptions' for sh syn extensions
Join short-circuit line in detect_background.vim
Break some continued lines in Vim indent files
Remove 'mac' from 'fileformats'
Tweak 'cpoptions' C flag instead of 'nocompatible'
Remove a baseless assertion I made in a config
Make entire syntax config dependent on load state
Activate syntax settings conditionally
Diffstat (limited to 'vim/after')
| -rw-r--r-- | vim/after/indent/vim.vim | 4 | ||||
| -rw-r--r-- | vim/after/syntax/sh.vim | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim index 0cb1d397..bfd92aeb 100644 --- a/vim/after/indent/vim.vim +++ b/vim/after/indent/vim.vim @@ -2,6 +2,6 @@ setlocal shiftwidth=2 setlocal softtabstop=2 if exists('b:undo_indent') - let b:undo_indent = b:undo_indent - \ . '|setlocal shiftwidth< softtabstop<' + let s:ui = '|setlocal shiftwidth< softtabstop<' + let b:undo_indent = b:undo_indent . s:ui endif diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 08dbd857..026e4ebd 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -1,3 +1,9 @@ +" Support line continuation for this file +if &compatible + let s:cpoptions_save = &cpoptions + set cpoptions-=C +endif + " If we know we have another shell type, clear away the others completely, now " that core syntax/sh.vim is done prodding /bin/sh to determine the system " shell type (which I don't care about). @@ -210,3 +216,9 @@ if exists('b:is_bash') \ variables \ wait endif + +" Restore 'cpoptions' setting if we touched it +if exists('s:cpoptions_save') + let &cpoptions = s:cpoptions_save + unlet s:cpoptions_save +endif |