Skip to content

Make merged file hidden while changing layout #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make merged file hidden while changing layout #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions autoload/mergetool.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ function! mergetool#set_layout(layout) " {{{
let l:_winstate = winsaveview()
endif

" Ensure merged file (which likely has unsaved conflict removal changes) can
" be hidden without error.
let bufhidden_bak = getbufvar(s:mergedfile_bufnr, '&bufhidden')
call setbufvar(s:mergedfile_bufnr, '&bufhidden', 'hide')

" Before changing layout, turn off diff mode in all visible windows
windo diffoff

Expand Down Expand Up @@ -198,6 +203,7 @@ function! mergetool#set_layout(layout) " {{{
if s:goto_win_with_merged_file() && exists('l:_winstate')
call winrestview(l:_winstate)
endif
call setbufvar(s:mergedfile_bufnr, '&bufhidden', bufhidden_bak)
endfunction " }}}

" Toggles between given and default layout
Expand Down