aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-18 10:24:10 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-18 10:24:10 +1200
commitd8ea133a4f3daaddcbb32fef4191c65d1a14b094 (patch)
treeb5a47754c6e614837ececefb2e8b20091f8bfd86
parentMerge branch 'release/v1.34.0' into develop (diff)
parentBump VERSION (diff)
downloaddotfiles-d8ea133a4f3daaddcbb32fef4191c65d1a14b094.tar.gz
dotfiles-d8ea133a4f3daaddcbb32fef4191c65d1a14b094.zip
Merge branch 'hotfix/v1.34.1' into develop
* hotfix/v1.34.1: Bump VERSION Correct 'directory' setting Don't test for +backup Vim feature
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc35
2 files changed, 17 insertions, 22 deletions
diff --git a/VERSION b/VERSION
index ba32cbdb..87330543 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.34.0
-Tue Jul 17 22:14:46 UTC 2018
+tejr dotfiles v1.34.1
+Tue Jul 17 22:23:42 UTC 2018
diff --git a/vim/vimrc b/vim/vimrc
index e6ff3c77..36090c8c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -50,11 +50,24 @@ set backspace+=eol " Line breaks
set backspace+=indent " Spaces from 'autoindent'
set backspace+=start " The start of current insertion
+" Do keep backups
+set backup
+
+" Try to keep them all in one system-appropriate dir, with full path
+if has('unix')
+ set backupdir^=~/.vim/cache/backup//
+elseif has('win32') || has('win64')
+ set backupdir^=~/vimfiles/cache/backup//
+endif
+
+" Don't back up stuff in /dev/shm or /var/tmp
+set backupskip+=/dev/shm,/var/tmp
+
" Try to keep swapfiles in one system-appropriate dir
if has('unix')
- set directory^=~/.vim/cache/undo
+ set directory^=~/.vim/cache/swap//
elseif has('win32') || has('win64')
- set directory^=~/vimfiles/cache/undo
+ set directory^=~/vimfiles/cache/swap//
endif
" How to deal with lines wrapping beyond the last screen row
@@ -112,24 +125,6 @@ set shortmess+=I
" Give me a bit longer to complete mappings
set timeoutlen=3000
-" Backup settings
-if has('backup')
-
- " Do keep backups
- set backup
-
- " Try to keep them all in one system-appropriate dir, with full path
- if has('unix')
- set backupdir^=~/.vim/cache/backup//
- elseif has('win32') || has('win64')
- set backupdir^=~/vimfiles/cache/backup//
- endif
-
- " Don't back up stuff in /dev/shm or /var/tmp
- set backupskip+=/dev/shm,/var/tmp
-
-endif
-
" Clear default 'comments' value, let the filetype handle it
if has('comments')
set comments=