diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-23 10:48:27 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-23 10:48:27 +1200 |
commit | cc8cc00508c8fd16c7a33307ee5e183909476e1d (patch) | |
tree | 1ccee2fd0bb886bee94dda5d3adce048762a4577 | |
parent | Merge branch 'hotfix/v1.37.1' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-cc8cc00508c8fd16c7a33307ee5e183909476e1d.tar.gz dotfiles-cc8cc00508c8fd16c7a33307ee5e183909476e1d.zip |
Merge branch 'hotfix/v1.37.2'v1.37.2
* hotfix/v1.37.2:
Bump VERSION
Refactor Git commit cursor column with snip line
Set gitconfig commit.verbose, clear commit.status
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | git/gitconfig.mi5 | 2 | ||||
-rw-r--r-- | vim/autoload/gitcommit.vim | 21 |
3 files changed, 14 insertions, 13 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v1.37.1 -Sun Jul 22 10:51:40 UTC 2018 +tejr dotfiles v1.37.2 +Sun Jul 22 22:14:02 UTC 2018 diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5 index a7053486..edd7be77 100644 --- a/git/gitconfig.mi5 +++ b/git/gitconfig.mi5 @@ -14,7 +14,7 @@ ui = true [commit] - status = false + verbose = true [core] compression = 9 diff --git a/vim/autoload/gitcommit.vim b/vim/autoload/gitcommit.vim index 56b35ba6..170cc2d0 100644 --- a/vim/autoload/gitcommit.vim +++ b/vim/autoload/gitcommit.vim @@ -1,18 +1,19 @@ " Choose the color column depending on non-comment line count function! gitcommit#CursorColumn() abort - " Last line number - let l:ll = line('$') - " If we can find a line after the first that isn't a comment, we're " composing the message - if l:ll > 1 - for l:li in range(2, l:ll) - if getline(l:li) !~# '^\s*#' - return '+1' - endif - endfor - endif + for l:num in range(1, line('$')) + if l:num == 1 + continue + endif + let l:line = getline(l:num) + if strpart(l:line, 0, 1) !=# '#' + return '+1' + elseif l:line =~# '^# -\{24} >8 -\{24}$' + break + endif + endfor " Otherwise, we're still composing our subject return '51' |