103 |
) |
) |
104 |
(make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) |
(make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) |
105 |
|
|
106 |
|
;; check if there is no clash between the ancestor and one of the variants. |
107 |
|
(defsubst ediff-merge-region-is-non-clash (n) |
108 |
|
(string-match "prefer" (or (ediff-get-state-of-merge n) ""))) |
109 |
|
|
110 |
;; If ediff-show-clashes-only, check if there is no clash between the ancestor |
;; If ediff-show-clashes-only, check if there is no clash between the ancestor |
111 |
;; and one of the variants. |
;; and one of the variants. |
112 |
(defsubst ediff-merge-region-is-non-clash (n) |
(defsubst ediff-merge-region-is-non-clash-to-skip (n) |
113 |
(and ediff-show-clashes-only |
(and ediff-show-clashes-only |
114 |
(string-match "prefer" (or (ediff-get-state-of-merge n) "")))) |
(ediff-merge-region-is-non-clash n))) |
115 |
|
|
116 |
;; If ediff-skip-changed-regions, check if the merge region differs from |
;; If ediff-skip-changed-regions, check if the merge region differs from |
117 |
;; the current default. If a region is different from the default, it means |
;; the current default. If a region is different from the default, it means |