branch: master
commit af74300410d5c980056498db42aa8eb79f6f7826
Author: Justin Burkett <jus...@burkett.cc>
Commit: Justin Burkett <jus...@burkett.cc>

    Add vdiff-disable-folding user option
    
    * vdiff.el (vdiff-disable-folding): Add
    (vdiff--refresh-overlays): Update
---
 vdiff.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vdiff.el b/vdiff.el
index ec0b793..6d990f9 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -85,6 +85,10 @@
 break vdiff. It is empty by default."
   :type 'string)
 
+(defcustom vdiff-disable-folding nil
+  "If non-nil, disable folding in vdiff buffers."
+  :type 'boolean)
+
 (defcustom vdiff-fold-padding 6
   "Unchanged lines to leave unfolded around a fold"
   :type 'integer)
@@ -1142,7 +1146,8 @@ of a \"word\"."
                             (with-current-buffer c-buffer
                               (line-number-at-pos (point-max))))))
               folds))
-      (vdiff--add-folds a-buffer b-buffer c-buffer folds))))
+      (unless vdiff-disable-folding
+        (vdiff--add-folds a-buffer b-buffer c-buffer folds)))))
 
 ;; * Send/Receive changes
 

Reply via email to