X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/d275446107360c7fad7d22b3d209173a252b1ac7..2bc5cc531c50d87c208965cdc80c0f42df56ecb1:/vim/ftplugin/gitrebase.vim

diff --git a/vim/ftplugin/gitrebase.vim b/vim/ftplugin/gitrebase.vim
index 7a15704..897aaf6 100644
--- a/vim/ftplugin/gitrebase.vim
+++ b/vim/ftplugin/gitrebase.vim
@@ -1,5 +1,16 @@
-nnoremap <leader>p :Pick<cr>
-nnoremap <leader>s :Squash<cr>
-nnoremap <leader>e :Edit<cr>
-nnoremap <leader>r :Reword<cr>
-nnoremap <leader>f :Fixup<cr>
+setlocal nomodeline   " first line might contain 'vim:'
+
+nnoremap <buffer> <nowait> <leader>p :Pick<cr>
+nnoremap <buffer> <nowait> <leader>s :Squash<cr>
+nnoremap <buffer> <nowait> <leader>e :Edit<cr>
+nnoremap <buffer> <nowait> <leader>r :Reword<cr>
+nnoremap <buffer> <nowait> <leader>f :Fixup<cr>
+nnoremap <buffer> <nowait> <leader>d :Drop<cr>
+
+" used to be part of vim, now removed see
+" https://github.com/tpope/vim-git/commit/3a96b1bca
+" https://github.com/tpope/vim-git/commit/6ee5e1f20
+let &l:keywordprg = 'git show'
+nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K'
+
+let b:undo_ftplugin = "setl keywordprg< |exe 'nunmap <buffer> K'"