aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-02 14:58:49 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-02 14:59:22 +1200
commit9b75b0d7b0870144d609165c4c0f826f50778b65 (patch)
treedde82c3dc68da43891cb431d0d71be017b4c1eed
parentMerge branch 'release/v0.40.0' into develop (diff)
downloaddotfiles-9b75b0d7b0870144d609165c4c0f826f50778b65.tar.gz
dotfiles-9b75b0d7b0870144d609165c4c0f826f50778b65.zip
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.
-rw-r--r--.gitmodules6
m---------vim/bundle/put_blank_lines0
m---------vim/bundle/unimpaired0
-rw-r--r--vim/config/buffers.vim8
-rw-r--r--vim/config/whitespace.vim4
5 files changed, 15 insertions, 3 deletions
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
+Subproject c25c045419bf818ff4a6474600e92a29f7ee7c9
diff --git a/vim/bundle/unimpaired b/vim/bundle/unimpaired
deleted file mode 160000
-Subproject fe7d2241df475de631b8891fdccd20bf9a7574d
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