aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-16 03:22:28 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-16 03:22:28 +1200
commit8afb7b5b1b945ffb60e2ff23251af63583f44d3e (patch)
tree81de6c6471b4bd83001b2ed91e5749fbb5560f68
parentMerge branch 'release/v6.10.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-8afb7b5b1b945ffb60e2ff23251af63583f44d3e.tar.gz
dotfiles-8afb7b5b1b945ffb60e2ff23251af63583f44d3e.zip
Merge branch 'release/v6.11.0'v6.11.0
* release/v6.11.0: Use <Plug> mapping target for paste_insert.vim Strip buflocal property from paste_insert autocmds
-rw-r--r--VERSION4
-rw-r--r--vim/autoload/paste_insert.vim6
-rw-r--r--vim/plugin/paste_insert.vim2
-rw-r--r--vim/vimrc3
4 files changed, 8 insertions, 7 deletions
diff --git a/VERSION b/VERSION
index bbb24c3a..587f6a86 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.10.0
-Sat, 15 Jun 2019 15:08:26 +0000
+tejr dotfiles v6.11.0
+Sat, 15 Jun 2019 15:22:27 +0000
diff --git a/vim/autoload/paste_insert.vim b/vim/autoload/paste_insert.vim
index b02d8e7a..ada11456 100644
--- a/vim/autoload/paste_insert.vim
+++ b/vim/autoload/paste_insert.vim
@@ -1,12 +1,12 @@
function! paste_insert#() abort
augroup paste_insert
autocmd!
- autocmd CursorHold,CursorMoved,User <buffer>
+ autocmd CursorHold,CursorMoved,User *
\ set nopaste paste?
\|autocmd! paste_insert
- autocmd InsertEnter <buffer>
+ autocmd InsertEnter *
\ set paste paste?
- \|autocmd paste_insert InsertLeave <buffer>
+ \|autocmd paste_insert InsertLeave *
\ doautocmd paste_insert User
augroup END
endfunction
diff --git a/vim/plugin/paste_insert.vim b/vim/plugin/paste_insert.vim
index be578746..9cd5415e 100644
--- a/vim/plugin/paste_insert.vim
+++ b/vim/plugin/paste_insert.vim
@@ -4,3 +4,5 @@ endif
let loaded_paste_insert = 1
command! -bar PasteInsert
\ call paste_insert#()
+nnoremap <Plug>PasteInsert
+ \ :<C-U>PasteInsert<CR>
diff --git a/vim/vimrc b/vim/vimrc
index e29f1e01..df805727 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1320,8 +1320,7 @@ xmap <Leader>L <Esc><Leader>Lgv
" kept confusing me. I'm hoping this will be better.
"" Leader,p prepares the next insert for paste mode
-nnoremap <Leader>p
- \ :<C-U>PasteInsert<CR>
+nmap <Leader>p <Plug>PasteInsert
" These mappings are for managing filetypes. The first one uses the
" :ReloadFileType command that was defined much earlier in this file for