config/vim
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Replace ad hoc conflict markers with plugin

Browse Source
This commit is contained in:
Kenneth Benzie
2022-11-07 14:26:55 +00:00
parent 32610db521
commit 330329ef2b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/autocmds.vim
View File

@@ -12,9 +12,6 @@ augroup benieAugroup
au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
\ | exe "normal! g'\"" | endif
" Highlight conflict markers in any filetype
au FileType * call matchadd('Todo', '^\(<<<<<<<\s.*\||||||||\|=======\|>>>>>>>\s.*\)$')
" Update `Last change: <date>` on write & go back previous cursor position
au FileType help au BufWritePre <buffer>
\ 1s/Last change: \zs.*$/\=strftime('%Y %b %d')/e|norm!``