VimPlug/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2025-12-06 12:14:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

whitepace: add whitespace to conflict detection marker
Some checks failed
CI / Test (v7.4) (push) Has been cancelled
Details
CI / Test (v8.0.0000) (push) Has been cancelled
Details
CI / Test (v8.1.0000) (push) Has been cancelled
Details
CI / Test (v8.2.0000) (push) Has been cancelled
Details
CI / Test (v8.2.1000) (push) Has been cancelled
Details
CI / Test (v9.0.0000) (push) Has been cancelled
Details
CI / Test (v9.1.0000) (push) Has been cancelled
Details
reviewdog / runner / vint (push) Has been cancelled
Details

Browse Source 
closes: #2727

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-07-14 20:55:36 +02:00
parent 41c5f54507
commit 5ca7f0b7fe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/airline/extensions/whitespace.vim
View File

@@ -51,7 +51,8 @@ endfunction
function! s:conflict_marker()
" Checks for git conflict markers
let annotation = '\%([0-9A-Za-z_.:]\+\)\?'
" space required for jj conflict marker: #2727
let annotation = '\%([0-9A-Za-z_.: ]\+\)\?'
if match(['rst', 'markdown', 'rmd'], &ft) >= 0
" rst filetypes use '=======' as header
let pattern = '^\%(\%(<\{7} '.annotation. '\)\|\%(>\{7\} '.annotation.'\)\)$'