Lines Matching defs:from
71 diff region from variant A
73 diff region from the ancestor
75 diff region from variant B
91 (defcustom ediff-skip-merge-regions-that-differ-from-default nil
93 A region is considered to have been changed if it is different from the current
97 as `prefer-A', but is different from the corresponding difference region in
98 Buffer A or if it is marked as `prefer-B' and is different from the region in
103 (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default)
118 ;; If ediff-skip-changed-regions, check if the merge region differs from
119 ;; the current default. If a region is different from the default, it means
122 (defsubst ediff-skip-merge-region-if-changed-from-default-p (n)
123 (and ediff-skip-merge-regions-that-differ-from-default
124 (ediff-merge-changed-from-default-p n 'prefers-too)))
237 (if (or (ediff-merge-changed-from-default-p n)
368 (defun ediff-merge-changed-from-default-p (diff-num &optional prefers-too)