Mercurial > emacs
changeset 66687:26faad662ac6
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Fri, 04 Nov 2005 05:40:03 +0000 |
| parents | ca587da00ba1 |
| children | 4f7af488adb0 |
| files | lisp/ChangeLog lisp/ediff-merg.el lisp/ediff-util.el |
| diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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
--- 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.
--- 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)))