aboutsummaryrefslogtreecommitdiff
path: root/runtime/ftplugin/gitcommit.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-04-28 21:06:44 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-04-28 21:13:55 +0200
commita53409b564458f7a94c8fcd0725d1953dee58dce (patch)
tree27bf0fa5f804d33455b66814c62a0f3358809d1b /runtime/ftplugin/gitcommit.vim
parentf09651ea78b833d6d05db89c41df603b741ab000 (diff)
downloadrneovim-a53409b564458f7a94c8fcd0725d1953dee58dce.tar.gz
rneovim-a53409b564458f7a94c8fcd0725d1953dee58dce.tar.bz2
rneovim-a53409b564458f7a94c8fcd0725d1953dee58dce.zip
vim-patch:89bcfda6834a
Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Diffstat (limited to 'runtime/ftplugin/gitcommit.vim')
-rw-r--r--runtime/ftplugin/gitcommit.vim17
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