aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-02 11:02:25 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-02 11:02:25 +1200
commitcbaa10e9f4b2708ad1733f06992e68cba9d04296 (patch)
treed280f62e5609a89a75d4cdfc09a6838fa283bac5
parentClear away stock vim ftplugin's buffer maps (diff)
downloaddotfiles-cbaa10e9f4b2708ad1733f06992e68cba9d04296.tar.gz
dotfiles-cbaa10e9f4b2708ad1733f06992e68cba9d04296.zip
Add insert_cancel.vim plugin and configuration
-rw-r--r--.gitmodules3
m---------vim/bundle/insert_cancel0
-rw-r--r--vim/vimrc4
3 files changed, 6 insertions, 1 deletions
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
+Subproject ec0551228a91752d2be5f9d771e2cb5a624e6ba
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