Mercurial > emacs
diff lisp/ediff-util.el @ 20003:9bc6a4017c8c
new version
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Tue, 30 Sep 1997 01:13:53 +0000 |
parents | a016beb4f4cf |
children | f44ff2c52fac |
line wrap: on
line diff
--- a/lisp/ediff-util.el Mon Sep 29 18:53:12 1997 +0000 +++ b/lisp/ediff-util.el Tue Sep 30 01:13:53 1997 +0000 @@ -1586,20 +1586,20 @@ (if (< ediff-current-difference ediff-number-of-differences) (let ((n (min ediff-number-of-differences (+ ediff-current-difference arg))) - regexp-skip) + non-clash-skip regexp-skip) (ediff-visible-region) (or (>= n ediff-number-of-differences) (setq regexp-skip (funcall ediff-skip-diff-region-function n)) + ;; this won't exec if regexp-skip is t + (setq non-clash-skip (ediff-merge-region-is-non-clash n)) (ediff-install-fine-diff-if-necessary n)) (while (and (< n ediff-number-of-differences) (or ;; regexp skip regexp-skip ;; skip clashes, if necessary - (and ediff-show-clashes-only - (string-match "prefer" - (or (ediff-get-state-of-merge n) ""))) + non-clash-skip ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions (eq (ediff-no-fine-diffs-p n) t)))) @@ -1608,6 +1608,8 @@ (message "Skipped over region %d and counting ..." n)) (or (>= n ediff-number-of-differences) (setq regexp-skip (funcall ediff-skip-diff-region-function n)) + ;; this won't exec if regexp-skip is t + (setq non-clash-skip (ediff-merge-region-is-non-clash n)) (ediff-install-fine-diff-if-necessary n)) ) (message "") @@ -1623,20 +1625,20 @@ (ediff-barf-if-not-control-buffer) (if (> ediff-current-difference -1) (let ((n (max -1 (- ediff-current-difference arg))) - regexp-skip) + non-clash-skip regexp-skip) (ediff-visible-region) (or (< n 0) (setq regexp-skip (funcall ediff-skip-diff-region-function n)) + ;; this won't exec if regexp-skip is t + (setq non-clash-skip (ediff-merge-region-is-non-clash n)) (ediff-install-fine-diff-if-necessary n)) (while (and (> n -1) (or ;; regexp skip regexp-skip ;; skip clashes, if necessary - (and ediff-show-clashes-only - (string-match "prefer" - (or (ediff-get-state-of-merge n) ""))) + non-clash-skip ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions (eq (ediff-no-fine-diffs-p n) t)))) @@ -1645,6 +1647,8 @@ (setq n (1- n)) (or (< n 0) (setq regexp-skip (funcall ediff-skip-diff-region-function n)) + ;; this won't exec if regexp-skip is t + (setq non-clash-skip (ediff-merge-region-is-non-clash n)) (ediff-install-fine-diff-if-necessary n)) ) (message "")