mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
Michael Kifer 2005-11-04 05:40:03 +00:00
parent 51f47f643c
commit 39bcfe5f46
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -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

5
lisp/ediff-merg.el
View file

@ -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.

1
lisp/ediff-util.el
View file

@ -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)))