2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>

	* 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84f90e1ce5abf58c8d71016397e0aebe5cd1092c..fad5fa8b32269baa12b91290b2324991749f958e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-04  Michael Kifer  <kifer@cs.stonybrook.edu>
+       
+       * 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  <mituharu@math.s.chiba-u.ac.jp>
 
        * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Undo

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index b08238467df45d8c787570fa8164d7948fde8fcf..5a5a2983327c5f7d10de4d2d35c3d53f5b6cd64a 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -104,8 +104,11 @@ Buffer B."
 (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 --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 41f294c1b13de5ba725d0a5125845dd2ad0964a4..9db05ad143b4f8edf0bd550369d08fdf7e91ec97 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1794,6 +1794,7 @@ With a prefix argument, go back that many differences."
                     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)))