# HG changeset patch # User Michael Kifer # Date 1131082803 0 # Node ID 26faad662ac6c750d71e1dffa5821e81986cce39 # Parent ca587da00ba1436fd704701c7b23981a960fa2ec 2005-11-04 Michael Kifer * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not merging. * ediff-util.el (ediff-previous-difference): don't skip regions that have merge clashes. diff -r ca587da00ba1 -r 26faad662ac6 lisp/ChangeLog --- a/lisp/ChangeLog Fri Nov 04 05:37:09 2005 +0000 +++ b/lisp/ChangeLog Fri Nov 04 05:40:03 2005 +0000 @@ -1,3 +1,11 @@ +2005-11-04 Michael Kifer + + * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not + merging. + + * ediff-util.el (ediff-previous-difference): don't skip regions that + have merge clashes. + 2005-11-04 YAMAMOTO Mitsuharu * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo diff -r ca587da00ba1 -r 26faad662ac6 lisp/ediff-merg.el --- a/lisp/ediff-merg.el Fri Nov 04 05:37:09 2005 +0000 +++ b/lisp/ediff-merg.el Fri Nov 04 05:40:03 2005 +0000 @@ -104,8 +104,11 @@ (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) ;; check if there is no clash between the ancestor and one of the variants. +;; if it is not a merge job then return true (defsubst ediff-merge-region-is-non-clash (n) - (string-match "prefer" (or (ediff-get-state-of-merge n) ""))) + (if (ediff-merge-job) + (string-match "prefer" (or (ediff-get-state-of-merge n) "")) + t)) ;; If ediff-show-clashes-only, check if there is no clash between the ancestor ;; and one of the variants. diff -r ca587da00ba1 -r 26faad662ac6 lisp/ediff-util.el --- a/lisp/ediff-util.el Fri Nov 04 05:37:09 2005 +0000 +++ b/lisp/ediff-util.el Fri Nov 04 05:40:03 2005 +0000 @@ -1794,6 +1794,7 @@ skip-changed ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions + (ediff-merge-region-is-non-clash n) (or (eq (ediff-no-fine-diffs-p n) t) (and (ediff-merge-job) (eq (ediff-no-fine-diffs-p n) 'C)))