aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-29 14:07:03 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-29 14:07:03 +1200
commit3f2fac88e3bd4debd263f01dcab90e7eec5a4a67 (patch)
tree96791084fce882efebf561dc202ad92875a6e8d2
parentMerge branch 'release/v0.3.0' (diff)
parentBump VERSION (diff)
downloadvim-diff-prune-3f2fac88e3bd4debd263f01dcab90e7eec5a4a67.tar.gz
vim-diff-prune-3f2fac88e3bd4debd263f01dcab90e7eec5a4a67.zip
Merge branch 'release/v0.4.0'v0.4.0
* release/v0.4.0: Bump VERSION Add <unique> attribute to mappings
-rw-r--r--VERSION2
-rw-r--r--after/ftplugin/diff/prune.vim4
2 files changed, 3 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 0d91a54..1d0ba9e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.0
+0.4.0
diff --git a/after/ftplugin/diff/prune.vim b/after/ftplugin/diff/prune.vim
index 00f42bd..7830cba 100644
--- a/after/ftplugin/diff/prune.vim
+++ b/after/ftplugin/diff/prune.vim
@@ -21,14 +21,14 @@ let b:undo_ftplugin = b:undo_ftplugin
\ . '|unlet b:did_ftplugin_diff_prune'
" Define normal mode mapping target
-nnoremap <buffer> <silent>
+nnoremap <buffer> <silent> <unique>
\ <Plug>DiffPrune
\ :<C-U>set operatorfunc=diff#prune#Prune<CR>g@
let b:undo_ftplugin = b:undo_ftplugin
\ . '|nunmap <buffer> <Plug>DiffPrune'
" Define visual mode mapping target
-vnoremap <buffer> <silent>
+vnoremap <buffer> <silent> <unique>
\ <Plug>DiffPrune
\ :<C-U>call diff#prune#Prune(visualmode())<CR>
let b:undo_ftplugin = b:undo_ftplugin