aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-08-16 12:37:53 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-08-16 12:37:53 +1200
commit16ad1c0453675ae097a030b92060e53344a7b863 (patch)
tree1ca7efef09d3f9491847f26e3a910e584b29a789 /vim/vimrc
parent4dd8d125cd401137d18d196e4125aa8fe789d2a0 (diff)
parentb3da7c05b57542f48f39c6fd24307f1781754c4f (diff)
downloaddotfiles-16ad1c0453675ae097a030b92060e53344a7b863.tar.gz
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/vimrc')
-rw-r--r--vim/vimrc28
1 files changed, 20 insertions, 8 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 2531327d..68f18c8a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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