Mercurial > vim
annotate runtime/ftplugin/gitcommit.vim @ 34662:81e6583c8b73 v9.1.0214
patch 9.1.0214: Duplicate condition in win_lbr_chartabsize()
Commit: https://github.com/vim/vim/commit/5532d3b3f0c73d4e0fa07122ebbed3bf201870f9
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Mar 28 10:04:25 2024 +0100
patch 9.1.0214: Duplicate condition in win_lbr_chartabsize()
Problem: Duplicate condition in win_lbr_chartabsize().
Solution: Remove the duplicate condition, as it's already checked above.
(zeertzjq)
closes: #14320
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Mar 2024 10:15:06 +0100 |
| parents | 9828ad8d79bd |
| children |
| rev | line source |
|---|---|
| 1619 | 1 " Vim filetype plugin |
| 2034 | 2 " Language: git commit file |
| 3 " Maintainer: Tim Pope <vimNOSPAM@tpope.org> | |
|
34039
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
4 " Last Change: 2023 Dec 28 |
| 1619 | 5 |
| 6 " Only do this when not done yet for this buffer | |
| 7 if (exists("b:did_ftplugin")) | |
| 8 finish | |
| 9 endif | |
| 10 | |
| 11 let b:did_ftplugin = 1 | |
| 12 | |
|
10048
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
4681
diff
changeset
|
13 setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=72 |
| 18818 | 14 setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q formatoptions+=n |
|
34039
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
15 setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}]\\s\\+\\\|^\\s*[-*+]\\s\\+ |
| 27036 | 16 setlocal include=^+++ |
| 17 setlocal includeexpr=substitute(v:fname,'^[bi]/','','') | |
| 18818 | 18 |
| 27036 | 19 let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms< formatlistpat< inc< inex<' |
| 1619 | 20 |
| 27036 | 21 let s:l = search('\C\m^[#;@!$%^&|:] -\{24,\} >8 -\{24,\}$', 'cnW', '', 100) |
| 22 let &l:comments = ':' . (matchstr(getline(s:l ? s:l : '$'), '^[#;@!$%^&|:]\S\@!') . '#')[0] | |
| 23 let &l:commentstring = &l:comments[1] . ' %s' | |
| 24 unlet s:l | |
| 25 | |
| 26 if exists("g:no_gitcommit_commands") | |
| 1619 | 27 finish |
| 28 endif | |
| 29 | |
| 27036 | 30 command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0, <f-args>) |
| 1619 | 31 |
|
10048
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
4681
diff
changeset
|
32 let b:undo_ftplugin = b:undo_ftplugin . "|delc DiffGitCached" |
|
43efa4f5a8ea
commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents:
4681
diff
changeset
|
33 |
| 27036 | 34 function! s:diffcomplete(A, L, P) abort |
| 2202 | 35 let args = "" |
| 36 if a:P <= match(a:L." -- "," -- ")+3 | |
| 37 let args = args . "-p\n--stat\n--shortstat\n--summary\n--patch-with-stat\n--no-renames\n-B\n-M\n-C\n" | |
| 38 end | |
| 27036 | 39 if a:A !~ '^-' && !empty(getftype('.git')) |
| 40 let args = args."\n".system("git diff --cached --name-only") | |
| 2202 | 41 endif |
| 42 return args | |
| 1619 | 43 endfunction |
| 44 | |
|
34039
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
45 function! s:setupdiff() abort |
|
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
46 command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0, <f-args>) |
|
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
47 setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git |
|
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
48 endfunction |
|
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
49 |
| 27036 | 50 function! s:gitdiffcached(bang, ...) abort |
| 2202 | 51 let name = tempname() |
| 52 if a:0 | |
| 27036 | 53 let extra = join(map(copy(a:000), 'shellescape(v:val)')) |
| 2202 | 54 else |
| 55 let extra = "-p --stat=".&columns | |
| 56 endif | |
| 27036 | 57 call system("git diff --cached --no-color --no-ext-diff ".extra." > ".shellescape(name)) |
|
34039
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
58 exe 'pedit +call\ s:setupdiff()' fnameescape(name) |
|
9828ad8d79bd
runtime(gitcommit): Updates to ftplugin and syntax
Christian Brabandt <cb@256bit.org>
parents:
27036
diff
changeset
|
59 silent! wincmd P |
| 1619 | 60 endfunction |