From cbaa10e9f4b2708ad1733f06992e68cba9d04296 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 2 Jul 2018 11:02:25 +1200
Subject: Add insert_cancel.vim plugin and configuration

---
 .gitmodules              | 3 +++
 vim/bundle/insert_cancel | 1 +
 vim/vimrc                | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 vim/bundle/insert_cancel

diff --git a/.gitmodules b/.gitmodules
index 14a95b64..6f4c3e62 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,6 +14,9 @@
 [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
 [submodule "vim/bundle/insert_suspend_hlsearch"]
     path = vim/bundle/insert_suspend_hlsearch
     url = https://sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git
diff --git a/vim/bundle/insert_cancel b/vim/bundle/insert_cancel
new file mode 160000
index 00000000..ec055122
--- /dev/null
+++ b/vim/bundle/insert_cancel
@@ -0,0 +1 @@
+Subproject commit ec0551228a91752d2be5f9d771e2cb5a624e6ba4
diff --git a/vim/vimrc b/vim/vimrc
index 29ddccec..80eef1e6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -168,7 +168,9 @@ endif
 noremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L>
 
 " Stack insert Ctrl-C to undo the escaped insert operation
-inoremap <C-C> <C-C>u
+" Default to not-quite-correct vim-tiny-compatible map if no plugin
+inoremap <Plug>InsertCancel <C-C>u
+imap <C-C> <Plug>InsertCancel
 
 " Remap normal J to stay in place while joining lines
 if &loadplugins
-- 
cgit v1.2.3