aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-08 21:24:13 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-08 21:24:13 +1200
commite015502fa63ff48ffb0493dd21106b0855f26364 (patch)
tree629c22089b606cd91811b9b51aa791cdce51a9e6
parentMerge branch 'release/v0.4.0' (diff)
parentBump VERSION (diff)
downloadvim-diff-prune-e015502fa63ff48ffb0493dd21106b0855f26364.tar.gz
vim-diff-prune-e015502fa63ff48ffb0493dd21106b0855f26364.zip
Merge branch 'release/v1.0.0'v1.0.0
* release/v1.0.0: Fix and extend the configuration example Rename plugin maps with <Plug>(parens)
-rw-r--r--VERSION2
-rw-r--r--after/ftplugin/diff/prune.vim8
-rw-r--r--doc/diff_prune.txt22
3 files changed, 17 insertions, 15 deletions
diff --git a/VERSION b/VERSION
index 1d0ba9e..3eefcb9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0
+1.0.0
diff --git a/after/ftplugin/diff/prune.vim b/after/ftplugin/diff/prune.vim
index 7830cba..185d04f 100644
--- a/after/ftplugin/diff/prune.vim
+++ b/after/ftplugin/diff/prune.vim
@@ -22,14 +22,14 @@ let b:undo_ftplugin = b:undo_ftplugin
" Define normal mode mapping target
nnoremap <buffer> <silent> <unique>
- \ <Plug>DiffPrune
+ \ <Plug>(DiffPrune)
\ :<C-U>set operatorfunc=diff#prune#Prune<CR>g@
let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>DiffPrune'
+ \ . '|nunmap <buffer> <Plug>(DiffPrune)'
" Define visual mode mapping target
vnoremap <buffer> <silent> <unique>
- \ <Plug>DiffPrune
+ \ <Plug>(DiffPrune)
\ :<C-U>call diff#prune#Prune(visualmode())<CR>
let b:undo_ftplugin = b:undo_ftplugin
- \ . '|vunmap <buffer> <Plug>DiffPrune'
+ \ . '|vunmap <buffer> <Plug>(DiffPrune)'
diff --git a/doc/diff_prune.txt b/doc/diff_prune.txt
index ed1932b..f708d73 100644
--- a/doc/diff_prune.txt
+++ b/doc/diff_prune.txt
@@ -19,18 +19,20 @@ This plugin is only available if 'compatible' is not set. It requires Vim 7.0
or newer.
MAPPINGS *diff_prune-mappings*
- *<Plug>DiffPrune*
+ *<Plug>(DiffPrune)*
-A single mapping target name `<Plug>DiffPrune` for normal and visual modes
-provided. You could put this in your `~/.vimrc` to use `<LocalLeader>p`:
+A single mapping target name `<Plug>(DiffPrune)` for normal and visual modes
+provided. There is no default key mapping. You could put this in
+`after/ftplugin/diff.vim` to use `<LocalLeader>p`, with `<LocalLeader>pp` to
+prune the current line:
>
- augroup vimrc
- autocmd!
- autocmd FileType diff
- \ nmap <buffer> <LocalLeader>p <Plug>DiffPrune
- autocmd FileType diff
- \ xmap <buffer> <LocalLeader>p <Plug>DiffPrune
- augroup END
+ nmap <buffer> <LocalLeader>p <Plug>(DiffPrune)
+ xmap <buffer> <LocalLeader>p <Plug>(DiffPrune)
+ nmap <buffer> <LocalLeader>pp <Plug>(DiffPrune)_
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>p'
+ \ . '|xunmap <buffer> <LocalLeader>p'
+ \ . '|nunmap <buffer> <LocalLeader>pp'
<
AUTHOR *diff_prune-author*