diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-08-11 14:55:02 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-08-11 15:06:07 -0400 |
| commit | 594536a1e71c90fd558501a675c459b8c7c242ea (patch) | |
| tree | 72b8a8a464da5f29a4909e8db8b917c08a4de627 /src/nvim/buffer.c | |
| parent | 90128843f68bc6b96cc7ab7a97d172aaae742aa4 (diff) | |
| download | rneovim-594536a1e71c90fd558501a675c459b8c7c242ea.tar.gz rneovim-594536a1e71c90fd558501a675c459b8c7c242ea.tar.bz2 rneovim-594536a1e71c90fd558501a675c459b8c7c242ea.zip | |
vim-patch:8.0.1361: some users don't want to diff with hidden buffers
Problem: Some users don't want to diff with hidden buffers.
Solution: Add the "hiddenoff" item to 'diffopt'. (Alisue, closes vim/vim#2394)
https://github.com/vim/vim/commit/97ce419201421f65f4764549ed80307a7ef9c7a6
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 71e04ec0fb..d4e21d26f6 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -509,6 +509,10 @@ void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last) if (buf->b_nwindows > 0) --buf->b_nwindows; + if (diffopt_hiddenoff() && !unload_buf && buf->b_nwindows == 0) { + diff_buf_delete(buf); // Clear 'diff' for hidden buffer. + } + /* Return when a window is displaying the buffer or when it's not * unloaded. */ if (buf->b_nwindows > 0 || !unload_buf) |