aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-12 11:16:44 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-12 11:16:44 +1200
commit9c8ab3c31591ac46ce2ced1a699d86080f0676c0 (patch)
tree8c5067418fd7521162e1186d98c952c2f1f11027
parentUpgrade cmdwin_ctrlc.vim plugin (diff)
downloaddotfiles-9c8ab3c31591ac46ce2ced1a699d86080f0676c0.tar.gz
dotfiles-9c8ab3c31591ac46ce2ced1a699d86080f0676c0.zip
Remove fixed_join.vim plugin
From discussion with nickspoon; let's try out using the jump-to-join default behaviour for a little while, and use gq motions instead for formatting prose.
-rw-r--r--.gitmodules3
m---------vim/bundle/fixed_join0
-rw-r--r--vim/vimrc5
3 files changed, 0 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 390e7400..af225c02 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,9 +11,6 @@
[submodule "vim/bundle/copy_linebreak"]
path = vim/bundle/copy_linebreak
url = https://sanctum.geek.nz/code/vim-copy-linebreak.git
-[submodule "vim/bundle/fixed_join"]
- path = vim/bundle/fixed_join
- url = https://sanctum.geek.nz/code/vim-fixed-join.git
[submodule "vim/bundle/insert_cancel"]
path = vim/bundle/insert_cancel
url = https://sanctum.geek.nz/code/vim-insert-cancel.git
diff --git a/vim/bundle/fixed_join b/vim/bundle/fixed_join
deleted file mode 160000
-Subproject e24d47cba9efa6289867e04a12241767b880cd1
diff --git a/vim/vimrc b/vim/vimrc
index d1b47b0b..1dc90aa0 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -178,11 +178,6 @@ vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L>
inoremap <Plug>InsertCancel <Esc>u
imap <C-C> <Plug>InsertCancel
-" Remap normal J to stay in place while joining lines
-" Default to not-quite-correct vim-tiny-compatible map if no plugin
-nnoremap <Plug>FixedJoin mzJ`z
-nmap J <Plug>FixedJoin
-
" Remap normal/visual space to scroll down a page, backspace up
nnoremap <Space> <C-F>
nnoremap <BS> <C-B>