CVS update by michaelk packages/xemacs-packages/ediff, ChangeLog ...
User: michaelk
Date: 05/11/04 06:43:40
Modified: packages/xemacs-packages/ediff ediff-util.el ediff-merg.el
ChangeLog
Log:
* 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.
Revision Changes Path
1.30 +1 -0 XEmacs/packages/xemacs-packages/ediff/ediff-util.el
Index: ediff-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-util.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ediff-util.el 2005/10/06 00:17:44 1.29
+++ ediff-util.el 2005/11/04 05:43:37 1.30
＠＠ -1794,6 +1794,7 ＠＠ With a prefix argument, go back that man
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)))
1.13 +4 -1 XEmacs/packages/xemacs-packages/ediff/ediff-merg.el
Index: ediff-merg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-merg.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ediff-merg.el 2005/10/06 00:17:44 1.12
+++ ediff-merg.el 2005/11/04 05:43:37 1.13
＠＠ -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.92 +9 -1 XEmacs/packages/xemacs-packages/ediff/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ChangeLog 2005/10/06 17:37:12 1.91
+++ ChangeLog 2005/11/04 05:43:37 1.92
＠＠ -1,7 +1,15 ＠＠
+2005-11-04 Michael Kifer <kifer(a)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-10-06 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.56 released.
-
+
2005-10-05 Michael Kifer <kifer(a)cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.