diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-11-04 05:40:03 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-11-04 05:40:03 +0000 |
| commit | 39bcfe5f466c009125c81e609ca7b68ec60295f8 (patch) | |
| tree | ecb738e2a89bb870beac93140ed046be907f6210 /lisp | |
| parent | 51f47f643cb19decdd63e268b51f9b7fde40faa2 (diff) | |
| download | emacs-39bcfe5f466c009125c81e609ca7b68ec60295f8.tar.gz | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/ediff-merg.el | 5 | ||||
| -rw-r--r-- | lisp/ediff-util.el | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 84f90e1ce5a..fad5fa8b322 100644 --- 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 b08238467df..5a5a2983327 100644 --- 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 41f294c1b13..9db05ad143b 100644 --- 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))) |