branch: scratch/add-vdiff
commit f1eca801ce77aac5c204e612714f5b872d44713a
Author: justbur <[email protected]>
Commit: justbur <[email protected]>
Disable refine-all-hunks for diff3
---
vdiff.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 11ff83e..6e7d4d7 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -670,8 +670,10 @@ SYNTAX-CODE.
See `vdiff-default-refinement-syntax-code' to change the definition
of a \"word\"."
(interactive)
- (dolist (ovr (overlays-in (point-min) (point-max)))
- (vdiff-refine-this-hunk syntax-code ovr)))
+ ;; Doesn't work for diff3 yet
+ (when vdiff-mode
+ (dolist (ovr (overlays-in (point-min) (point-max)))
+ (vdiff-refine-this-hunk syntax-code ovr))))
;; Not working yet
;; (defun vdiff-refine-all-hunks-whitespace ()
