diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-16 12:37:53 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-16 12:37:53 +1200 |
commit | 16ad1c0453675ae097a030b92060e53344a7b863 (patch) | |
tree | 1ca7efef09d3f9491847f26e3a910e584b29a789 /vim | |
parent | Merge branch 'release/v1.53.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-16ad1c0453675ae097a030b92060e53344a7b863.tar.gz dotfiles-16ad1c0453675ae097a030b92060e53344a7b863.zip |
Merge branch 'release/v1.54.0'v1.54.0
* release/v1.54.0:
Bump VERSION
Add per-flag comments for 'bsk', 'ssop'
Use slightly more correct dir definitions
Bind Alt-' in readline to insert '\'' for shell
Allow loading gzip plugin
Simplify g:is_posix unset, add g:is_kornshell
Diffstat (limited to 'vim')
-rw-r--r-- | vim/after/syntax/sh.vim | 5 | ||||
-rw-r--r-- | vim/plugin/dist.vim | 1 | ||||
-rw-r--r-- | vim/vimrc | 28 |
3 files changed, 21 insertions, 13 deletions
diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 977ee2cb..95b4517d 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -6,10 +6,7 @@ endif " Remove g:is_posix if we resorted to it in order to get correct POSIX sh " highlighting with older Vim runtime files -if exists('g:is_posix') - \ && (v:version < 800 || v:version == 800 && !has('patch257')) - unlet g:is_posix -endif +unlet! g:is_posix g:is_kornshell " 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 diff --git a/vim/plugin/dist.vim b/vim/plugin/dist.vim index ac3671a2..37fc9042 100644 --- a/vim/plugin/dist.vim +++ b/vim/plugin/dist.vim @@ -3,7 +3,6 @@ let g:loaded_getscriptPlugin = 1 let g:loaded_vimballPlugin = 1 " Vim is the wrong tool for reading archives or compressed text -let g:loaded_gzip = 1 let g:loaded_tarPlugin = 1 let g:loaded_zipPlugin = 1 " I prefer filtering text with Unix tools @@ -46,11 +46,15 @@ set backspace+=start " The start of current insertion " Try to keep backups in one system-appropriate dir set backup -set backupdir^=~/.vim/cache/backup,~/vimfiles/cache/backup +set backupdir^=~/.vim/cache/backup +if has('win32') || has('win64') + set backupdir-=~/.vim/cache/backup + set backupdir^=~/vimfiles/cache/backup +endif " Add some paths not to back up -set backupskip^=/dev/shm/* -set backupskip^=/var/tmp/* +set backupskip^=/dev/shm/* " Shared memory RAM disk +set backupskip^=/var/tmp/* " Debian's $TMPDIR for sudoedit(8) " Indent wrapped lines silent! set breakindent @@ -69,7 +73,11 @@ if exists('+cursorline') endif " Try to keep swapfiles in one system-appropriate dir -set directory^=~/.vim/cache/swap//,~/vimfiles/cache/swap// +set directory^=~/.vim/cache/swap// +if has('win32') || has('win64') + set directory-=~/.vim/cache/swap// + set directory^=~/vimfiles/cache/swap// +endif " Use UTF-8 if we can and env LANG didn't tell us not to if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1' @@ -172,13 +180,17 @@ endif " Keep undo files, hopefully in a dedicated directory if has('persistent_undo') set undofile - set undodir^=~/.vim/cache/undo//,~/vimfiles/cache/undo// + set undodir^=~/.vim/cache/undo// + if has('win32') || has('win64') + set undodir-=~/.vim/cache/undo// + set undodir^=~/vimfiles/cache/undo// + endif endif -" Don't store any options or mappings in sessions +" Make sessions usable if exists('+sessionoptions') - set sessionoptions-=localoptions - set sessionoptions-=options + set sessionoptions-=localoptions " No buffer options or mappings + set sessionoptions-=options " No global options or mappings endif " Let me move beyond buffer text in visual block mode |