diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-21 12:05:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-21 12:05:36 +0200 |
| commit | 7a329911b9ae2b97453fd995bc3a6523cf3aab53 (patch) | |
| tree | b75f6a117f48fe0c441b67cca09490f623233a74 /runtime/ftplugin/gitrebase.vim | |
| parent | c6af8125c7593b3ca104bf1feac0d814fe76d92d (diff) | |
| download | vim-7a329911b9ae2b97453fd995bc3a6523cf3aab53.zip | |
Updated runtime files.
Diffstat (limited to 'runtime/ftplugin/gitrebase.vim')
| -rw-r--r-- | runtime/ftplugin/gitrebase.vim | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/runtime/ftplugin/gitrebase.vim b/runtime/ftplugin/gitrebase.vim index 4680d285e..0200ba1ac 100644 --- a/runtime/ftplugin/gitrebase.vim +++ b/runtime/ftplugin/gitrebase.vim @@ -1,11 +1,11 @@ " Vim filetype plugin " Language: git rebase --interactive " Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Last Change: 2009 Dec 24 +" Last Change: 2010 May 21 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) - finish + finish endif runtime! ftplugin/git.vim @@ -13,28 +13,29 @@ let b:did_ftplugin = 1 setlocal comments=:# commentstring=#\ %s formatoptions-=t if !exists("b:undo_ftplugin") - let b:undo_ftplugin = "" + let b:undo_ftplugin = "" endif let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo<" function! s:choose(word) - s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e + s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e endfunction function! s:cycle() - call s:choose(get({'s':'edit','p':'squash','e':'reword'},getline('.')[0],'pick')) + call s:choose(get({'s':'edit','p':'squash','e':'reword','r':'fixup'},getline('.')[0],'pick')) endfunction command! -buffer -bar Pick :call s:choose('pick') command! -buffer -bar Squash :call s:choose('squash') command! -buffer -bar Edit :call s:choose('edit') command! -buffer -bar Reword :call s:choose('reword') +command! -buffer -bar Fixup :call s:choose('fixup') command! -buffer -bar Cycle :call s:cycle() " The above are more useful when they are mapped; for example: "nnoremap <buffer> <silent> S :Cycle<CR> if exists("g:no_plugin_maps") || exists("g:no_gitrebase_maps") - finish + finish endif nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K' |