From 389158a68b4b6453fd7ab44945a41c4ae55c55fd Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 23 Aug 2018 09:04:35 +1200
Subject: Check for existence of :xmap for mapping

---
 vim/vimrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vim/vimrc b/vim/vimrc
index 02f992f3..032d3085 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -299,7 +299,9 @@ nnoremap <Bslash>p :<C-U>set paste! paste?<CR>
 nnoremap <Bslash>q gqap
 " \r acts as a replacement operator
 nmap <Bslash>r <Plug>(ReplaceOperator)
-xmap <Bslash>r <Plug>(ReplaceOperator)
+if exists(':xmap')
+  xmap <Bslash>r <Plug>(ReplaceOperator)
+endif
 " \R reloads ~/.vimrc
 nnoremap <Bslash>R :<C-U>source $MYVIMRC<CR>
 " \s toggles spell checking
-- 
cgit v1.2.3


From fd7ba721439e7e8643ff6d2bc0343d981fb4ebea Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 23 Aug 2018 09:18:48 +1200
Subject: Add collation locale def for plmu(1df) sort check

---
 bin/plmu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/plmu.sh b/bin/plmu.sh
index 06d5ce1d..5c599828 100644
--- a/bin/plmu.sh
+++ b/bin/plmu.sh
@@ -5,7 +5,7 @@ ef=$HOME/.plenv/non-cpanm-modules
 [ -e "$ef" ] || ef=/dev/null
 
 # Check that exceptions file is sorted
-if ! sort -c -- "$ef" ; then
+if ! LC_COLLATE=C sort -c -- "$ef" ; then
     printf >&2 '%s not sorted\n' "$ef"
     exit 1
 fi
-- 
cgit v1.2.3


From 8aca1c8f5f54a2d34e2f3b60607430b81f027b4c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 23 Aug 2018 09:35:52 +1200
Subject: Update diff_prune.vim plugin

---
 vim/bundle/diff_prune | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vim/bundle/diff_prune b/vim/bundle/diff_prune
index 50080840..389f2da8 160000
--- a/vim/bundle/diff_prune
+++ b/vim/bundle/diff_prune
@@ -1 +1 @@
-Subproject commit 50080840611c7111e10e71b0443d05b9ead76982
+Subproject commit 389f2da8759cbbcf275798fb1e8c93114fa2dc0c
-- 
cgit v1.2.3


From 53c2a0a4f96e83318095e6297f16e0bf1e6ffdcd Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 23 Aug 2018 12:20:48 +1200
Subject: Update replace_operator.vim plugin

---
 vim/bundle/replace_operator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vim/bundle/replace_operator b/vim/bundle/replace_operator
index 172fbc5f..d897f617 160000
--- a/vim/bundle/replace_operator
+++ b/vim/bundle/replace_operator
@@ -1 +1 @@
-Subproject commit 172fbc5f7e346c26c3cc64335de1e33347f79058
+Subproject commit d897f61790f31c71564a761c79b8839e76192d77
-- 
cgit v1.2.3


From 28cd5f84f719e589c466bb86ec704dcca32d7735 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 23 Aug 2018 12:21:01 +1200
Subject: Bump VERSION

---
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index b96a2579..a1078a4f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.59.0
-Wed Aug 22 10:22:43 UTC 2018
+tejr dotfiles v1.60.0
+Thu Aug 23 00:21:01 UTC 2018
-- 
cgit v1.2.3