From c6343abeb5a2cd4717aa777cf295c7e8eec5fad0 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 20 Jul 2018 20:38:09 +1200
Subject: Upgrade, reconfig strip_trailing_whitespace plugin

---
 vim/bundle/strip_trailing_whitespace | 2 +-
 vim/vimrc                            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'vim')

diff --git a/vim/bundle/strip_trailing_whitespace b/vim/bundle/strip_trailing_whitespace
index e689a609..3ecc30fe 160000
--- a/vim/bundle/strip_trailing_whitespace
+++ b/vim/bundle/strip_trailing_whitespace
@@ -1 +1 @@
-Subproject commit e689a60912a1832f167bdc88cf08cbba2a9ae7e1
+Subproject commit 3ecc30fe80b32003414d2647efb17e89c27c6aae
diff --git a/vim/vimrc b/vim/vimrc
index 297fd078..093023c6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -314,7 +314,10 @@ nnoremap <Bslash>V :<C-U>let b: t: w:<CR>
 " \w toggles wrapping
 nnoremap <Bslash>w :<C-U>setlocal wrap! wrap?<CR>
 " \x strips trailing whitespace via a custom plugin
-nmap <Bslash>x <Plug>(StripTrailingWhitespace)
+nmap <Bslash>x :<C-U>StripTrailingWhitespace<CR>
+if v:version >= 700
+  xmap <Bslash>x :StripTrailingWhitespace<CR>
+endif
 " \y shows all registers
 nnoremap <Bslash>y :<C-U>registers<CR>
 " \z sets NZ English spelling (compare \u)
-- 
cgit v1.2.3