Mercurial > emacs
comparison lisp/ediff-util.el @ 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 | d64aeb0dc54e |
| children | 0b958d61a229 |
comparison
equal
deleted
inserted
replaced
| 66686:ca587da00ba1 | 66687:26faad662ac6 |
|---|---|
| 1792 non-clash-skip | 1792 non-clash-skip |
| 1793 ;; skipp changed regions | 1793 ;; skipp changed regions |
| 1794 skip-changed | 1794 skip-changed |
| 1795 ;; skip difference regions that differ in white space | 1795 ;; skip difference regions that differ in white space |
| 1796 (and ediff-ignore-similar-regions | 1796 (and ediff-ignore-similar-regions |
| 1797 (ediff-merge-region-is-non-clash n) | |
| 1797 (or (eq (ediff-no-fine-diffs-p n) t) | 1798 (or (eq (ediff-no-fine-diffs-p n) t) |
| 1798 (and (ediff-merge-job) | 1799 (and (ediff-merge-job) |
| 1799 (eq (ediff-no-fine-diffs-p n) 'C))) | 1800 (eq (ediff-no-fine-diffs-p n) 'C))) |
| 1800 ))) | 1801 ))) |
| 1801 (if (= 0 (mod (1+ n) 20)) | 1802 (if (= 0 (mod (1+ n) 20)) |