Mercurial > vim
view runtime/ftplugin/gitcommit.vim @ 10581:dffda1f9b501 v8.0.0180
patch 8.0.0180: error E937 is used twice
commit https://github.com/vim/vim/commit/83381f7129aca00bc2dd24527f160bc6a60d70af
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 14 14:36:08 2017 +0100
patch 8.0.0180: error E937 is used twice
Problem: Error E937 is used both for duplicate key in JSON and for trying
to delete a buffer that is in use.
Solution: Rename the JSON error to E938. (Norio Takagi, closes #1376)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 14 Jan 2017 14:45:04 +0100 |
parents | 43efa4f5a8ea |
children | 5c40013d45ee |
line wrap: on
line source
" Vim filetype plugin " Language: git commit file " Maintainer: Tim Pope <vimNOSPAM@tpope.org> " Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if (exists("b:did_ftplugin")) finish endif runtime! ftplugin/git.vim let b:did_ftplugin = 1 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 endif if !exists("b:git_dir") let b:git_dir = expand("%:p:h") 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 let args = args . "-p\n--stat\n--shortstat\n--summary\n--patch-with-stat\n--no-renames\n-B\n-M\n-C\n" end if exists("b:git_dir") && a:A !~ '^-' let tree = fnamemodify(b:git_dir,':h') if strpart(getcwd(),0,strlen(tree)) == tree let args = args."\n".system("git diff --cached --name-only") endif endif return args endfunction function! s:gitdiffcached(bang,gitdir,...) let tree = fnamemodify(a:gitdir,':h') let name = tempname() let git = "git" if strpart(getcwd(),0,strlen(tree)) != tree let git .= " --git-dir=".(exists("*shellescape") ? shellescape(a:gitdir) : '"'.a:gitdir.'"') endif if a:0 let extra = join(map(copy(a:000),exists("*shellescape") ? 'shellescape(v:val)' : "'\"'.v:val.'\"'")) else let extra = "-p --stat=".&columns endif call system(git." diff --cached --no-color --no-ext-diff ".extra." > ".(exists("*shellescape") ? shellescape(name) : name)) exe "pedit ".(exists("*fnameescape") ? fnameescape(name) : name) wincmd P let b:git_dir = a:gitdir command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>) nnoremap <buffer> <silent> q :q<CR> setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git endfunction