diff src/buffer.c @ 12971:ca3cb1997f08 v8.0.1361

patch 8.0.1361: some users don't want to diff with hidden buffers commit https://github.com/vim/vim/commit/97ce419201421f65f4764549ed80307a7ef9c7a6 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 1 20:35:58 2017 +0100 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 https://github.com/vim/vim/issues/2394)
author Christian Brabandt <cb@256bit.org>
date Fri, 01 Dec 2017 20:45:08 +0100
parents 185f8dbdcf26
children 197a08152ad5
line wrap: on
line diff
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -593,6 +593,11 @@ aucmd_abort:
     if (buf->b_nwindows > 0)
 	--buf->b_nwindows;
 
+#ifdef FEAT_DIFF
+    if (diffopt_hiddenoff() && !unload_buf && buf->b_nwindows == 0)
+    	diff_buf_delete(buf);	/* Clear 'diff' for hidden buffer. */
+#endif
+
     /* Return when a window is displaying the buffer or when it's not
      * unloaded. */
     if (buf->b_nwindows > 0 || !unload_buf)