diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:41:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 01:41:29 +0200 |
| commit | 9f6d693e263b617cd1a1772e42911cd5a0b1675b (patch) | |
| tree | 593d3c9d968be92bc1ed8a445e6856079ef546ed /runtime/ftplugin/gitcommit.vim | |
| parent | 59be0b42806c39131f76f89c554f0a24e82514a8 (diff) | |
| parent | 53419673154a98b705cfa80590099a247cc9df49 (diff) | |
| download | rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.gz rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.bz2 rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.zip | |
Merge #6613 from justinmk/vim-patches
Diffstat (limited to 'runtime/ftplugin/gitcommit.vim')
| -rw-r--r-- | runtime/ftplugin/gitcommit.vim | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/runtime/ftplugin/gitcommit.vim b/runtime/ftplugin/gitcommit.vim index e8619004bf..6767ff719e 100644 --- a/runtime/ftplugin/gitcommit.vim +++ b/runtime/ftplugin/gitcommit.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: git commit file " Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Last Change: 2013 May 30 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) @@ -11,15 +11,10 @@ endif runtime! ftplugin/git.vim let b:did_ftplugin = 1 -setlocal nomodeline tabstop=8 formatoptions-=croq formatoptions+=tl - -let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions<' - -if &textwidth == 0 - " make sure that log messages play nice with git-log on standard terminals - setlocal textwidth=72 - let b:undo_ftplugin .= "|setl tw<" -endif +setlocal comments=:# commentstring=#\ %s +setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=72 +setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q +let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms<' if exists("g:no_gitcommit_commands") || v:version < 700 finish @@ -31,6 +26,8 @@ endif command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>) +let b:undo_ftplugin = b:undo_ftplugin . "|delc DiffGitCached" + function! s:diffcomplete(A,L,P) let args = "" if a:P <= match(a:L." -- "," -- ")+3 |