mirror of
https://github.com/vim-airline/vim-airline.git
synced 2025-07-10 07:34:38 +02:00
parent
07ab201a27
commit
0a87d08dbd
@ -52,7 +52,7 @@ endfunction
|
||||
function! s:conflict_marker()
|
||||
" Checks for git conflict markers
|
||||
let annotation = '\%([0-9A-Za-z_.:]\+\)\?'
|
||||
if &ft is# 'rst'
|
||||
if match(['rst', 'markdown'], &ft) >= 0
|
||||
" rst filetypes use '=======' as header
|
||||
let pattern = '^\%(\%(<\{7} '.annotation. '\)\|\%(>\{7\} '.annotation.'\)\)$'
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user