aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-02 15:02:50 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-02 15:02:50 +1200
commit8fd6554bd76af09c8c99266d7a8cb6425b376b38 (patch)
tree068cfc1672e336a66fced90dcd39ce63b1c93ca9
parenta4bec25de72f90a78e00044f4cef5185563cb561 (diff)
parent19cde9687b103533616b06f25628f13dd2162663 (diff)
downloaddotfiles-8fd6554bd76af09c8c99266d7a8cb6425b376b38.tar.gz
Merge branch 'release/v0.41.0'v0.41.0
* release/v0.41.0: Bump VERSION Remove abolish.vim and commentary.vim Remove unimpaired.vim
-rw-r--r--.gitmodules12
-rw-r--r--VERSION4
m---------vim/bundle/put_blank_lines0
m---------vim/bundle/unimpaired0
-rw-r--r--vim/config/buffers.vim8
-rw-r--r--vim/config/whitespace.vim4
6 files changed, 17 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules
index 53d12410..9bda87e8 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
@@ -36,18 +39,9 @@
url = https://sanctum.geek.nz/code/vim-sahara.git
# Others' Vim plugins
-[submodule "vim/bundle/abolish"]
- path = vim/bundle/abolish
- url = https://sanctum.geek.nz/clone/vim-abolish.git
-[submodule "vim/bundle/commentary"]
- path = vim/bundle/commentary
- url = https://sanctum.geek.nz/clone/vim-commentary.git
[submodule "vim/bundle/repeat"]
path = vim/bundle/repeat
url = https://sanctum.geek.nz/clone/vim-repeat.git
[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/VERSION b/VERSION
index 590f8c2b..8ba34a61 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.40.0
-Fri Jun 1 11:42:42 UTC 2018
+tejr dotfiles v0.41.0
+Sat Jun 2 03:01:42 UTC 2018
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