diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-05-10 11:32:04 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-05-10 11:32:04 +1200 |
commit | 01a1cf6229232efb4bfc43b976a7ccd5466a6c6f (patch) | |
tree | 0fa73ddf8b6dd96b94ccd7bbb623b56d3c228742 | |
parent | Merge branch 'release/v4.21.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-01a1cf6229232efb4bfc43b976a7ccd5466a6c6f.tar.gz dotfiles-01a1cf6229232efb4bfc43b976a7ccd5466a6c6f.zip |
Merge branch 'release/v4.22.0'v4.22.0
* release/v4.22.0:
Bump VERSION
Handle encoded path in Vim metadata correctly
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/vimrc | 16 |
2 files changed, 14 insertions, 6 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v4.21.0 -Thu May 9 22:42:30 UTC 2019 +tejr dotfiles v4.22.0 +Thu May 9 23:32:04 UTC 2019 @@ -56,9 +56,15 @@ set backspace+=eol " Line breaks set backspace+=indent " Spaces from 'autoindent' set backspace+=start " The start of current insertion -" Try to keep backups in one system-appropriate dir +" Try to keep backups in one system-appropriate dir, including full encoded +" path in filename (trailing double slash) if supported (8.1.0251) set backup -set backupdir^=$MYVIMRUNTIME/cache/backup +if v:version > 801 + \ || v:version == 801 && has('patch251') + set backupdir^=$MYVIMRUNTIME/cache/backup// +else + set backupdir^=$MYVIMRUNTIME/cache/backup +endif " Add some paths not to back up if has('unix') @@ -88,7 +94,8 @@ set confirm " Yes, I have become a filthy two-spacer set cpoptions+=J -" Try to keep swapfiles in one system-appropriate dir +" Try to keep swapfiles in one system-appropriate dir, including full encoded +" path in filename (trailing double slash) set directory^=$MYVIMRUNTIME/cache/swap// " Use UTF-8 if we can and env LANG didn't tell us not to @@ -203,7 +210,8 @@ if exists('+ttymouse') && &ttymouse !=# '' set ttymouse= endif -" Keep undo files, hopefully in a dedicated directory +" Try to keep persistent undo files in one system-appropriate dir, including +" full encoded path in filename (trailing double slash) if has('persistent_undo') set undofile set undodir^=$MYVIMRUNTIME/cache/undo// |