From 9b75b0d7b0870144d609165c4c0f826f50778b65 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 2 Jun 2018 14:58:49 +1200
Subject: Remove unimpaired.vim

Replace it with new plugin put_blank_lines.vim and new mappings to cycle
between open buffers: the only features from the plugin that I actually
use in recent memory.
---
 .gitmodules                | 6 +++---
 vim/bundle/put_blank_lines | 1 +
 vim/bundle/unimpaired      | 1 -
 vim/config/buffers.vim     | 8 ++++++++
 vim/config/whitespace.vim  | 4 ++++
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 160000 vim/bundle/put_blank_lines
 delete mode 160000 vim/bundle/unimpaired

diff --git a/.gitmodules b/.gitmodules
index 53d12410..158c0cb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,6 +17,9 @@
 [submodule "vim/bundle/mail_mutt"]
     path = vim/bundle/mail_mutt
     url = https://sanctum.geek.nz/code/vim-mail-mutt.git
+[submodule "vim/bundle/put_blank_lines"]
+    path = vim/bundle/put_blank_lines
+    url = https://sanctum.geek.nz/code/vim-put-blank-lines.git
 [submodule "vim/bundle/strip_trailing_whitespace"]
     path = vim/bundle/strip_trailing_whitespace
     url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git
@@ -48,6 +51,3 @@
 [submodule "vim/bundle/surround"]
     path = vim/bundle/surround
     url = https://sanctum.geek.nz/clone/vim-surround.git
-[submodule "vim/bundle/unimpaired"]
-    path = vim/bundle/unimpaired
-    url = https://sanctum.geek.nz/clone/vim-unimpaired.git
diff --git a/vim/bundle/put_blank_lines b/vim/bundle/put_blank_lines
new file mode 160000
index 00000000..c25c0454
--- /dev/null
+++ b/vim/bundle/put_blank_lines
@@ -0,0 +1 @@
+Subproject commit c25c045419bf818ff4a6474600e92a29f7ee7c99
diff --git a/vim/bundle/unimpaired b/vim/bundle/unimpaired
deleted file mode 160000
index fe7d2241..00000000
--- a/vim/bundle/unimpaired
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fe7d2241df475de631b8891fdccd20bf9a7574de
diff --git a/vim/config/buffers.vim b/vim/config/buffers.vim
index 92055fea..ddd40b9f 100644
--- a/vim/config/buffers.vim
+++ b/vim/config/buffers.vim
@@ -4,3 +4,11 @@ set switchbuf=useopen
 if v:version >= 701
   set switchbuf+=usetab
 endif
+
+" Cycle back and forth through buffers.
+nnoremap <silent>
+      \ [b
+      \ :<C-U>bp<CR>
+nnoremap <silent>
+      \ ]b
+      \ :<C-U>bn<CR>
diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim
index 99974cb1..fd20e7e5 100644
--- a/vim/config/whitespace.vim
+++ b/vim/config/whitespace.vim
@@ -21,3 +21,7 @@ set nojoinspaces
 
 " \x strips trailing whitespace via a custom plugin
 nmap <Leader>x <Plug>StripTrailingWhitespace
+
+" Insert blank lines above and below via a custom plugin
+nmap [<Space> <Plug>PutBlankLinesAbove
+nmap ]<Space> <Plug>PutBlankLinesBelow
-- 
cgit v1.2.3