From ab847d44e227e8f054522c4695077988fc465d17 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 2 Jul 2018 11:02:39 +1200
Subject: Reimplement fallback for fixed_join.vim

---
 vim/vimrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 80eef1e6..15d86763 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -173,9 +173,9 @@ inoremap <Plug>InsertCancel <C-C>u
 imap <C-C> <Plug>InsertCancel
 
 " Remap normal J to stay in place while joining lines
-if &loadplugins
-  nmap J <Plug>FixedJoin
-endif
+" 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
 nnoremap <Space> <C-F>
-- 
cgit v1.2.3