From 575f00d21486e0226064c4e1a18d522555257525 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 16 Aug 2018 10:49:19 +1200
Subject: Use slightly more correct dir definitions

---
 vim/vimrc | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 2531327d..86ce7158 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -46,7 +46,11 @@ 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/*
@@ -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,7 +180,11 @@ 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
-- 
cgit v1.2.3


From d46aac50323da8bec2e1f906bd37098a466a3fa5 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 16 Aug 2018 10:49:35 +1200
Subject: Add per-flag comments for 'bsk', 'ssop'

---
 vim/vimrc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 86ce7158..68f18c8a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -53,8 +53,8 @@ if has('win32') || has('win64')
 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
@@ -187,10 +187,10 @@ if has('persistent_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
-- 
cgit v1.2.3