Skip to content

Commit cd0066e

Browse files
committed
Set filetype for right split (RCONFL)
1 parent fb2a182 commit cd0066e

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

plugin/diffconflicts.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ endfunction
2121

2222
function! s:diffconfl()
2323
let l:origBuf = bufnr("%")
24+
let l:origFt = &filetype
2425

2526
" Set up the right-hand side.
2627
rightb vsplit
2728
enew
2829
silent execute "read #". l:origBuf
2930
1delete
3031
silent execute "file RCONFL"
32+
silent execute "set filetype=". l:origFt
3133
silent execute "g/^<<<<<<< /,/^=======\\r\\?$/d"
3234
silent execute "g/^>>>>>>> /d"
3335
setlocal nomodifiable readonly buftype=nofile bufhidden=delete nobuflisted

0 commit comments

Comments
 (0)