diff -u -F'defun' /export/home1/sl/local/share/emacs/20.7/lisp/ /export/home1/sl/local/share/emacs/20.7/site-lisp/ediff-util.el --- /export/home1/sl/local/share/emacs/20.7/lisp/ediff-util.el Tue May 2 13:46:59 2000 +++ /export/home1/sl/local/share/emacs/20.7/site-lisp/ediff-util.el Tue Jul 3 10:23:29 2001 @@ -1639,7 +1639,8 @@ (defun ediff-next-difference (&optional (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)) + (ediff-install-fine-diff-if-necessary n) + (ediff-set-fine-diff-properties n 'default)) (while (and (< n ediff-number-of-differences) (or ;; regexp skip @@ -1656,7 +1657,8 @@ (defun ediff-next-difference (&optional (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)) + (ediff-install-fine-diff-if-necessary n) + (ediff-set-fine-diff-properties n 'default)) ) (message "") (ediff-unselect-and-select-difference n) @@ -1678,7 +1680,8 @@ (defun ediff-previous-difference (&optio (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)) + (ediff-install-fine-diff-if-necessary n) + (ediff-set-fine-diff-properties n 'default)) (while (and (> n -1) (or ;; regexp skip @@ -1695,7 +1698,8 @@ (defun ediff-previous-difference (&optio (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)) + (ediff-install-fine-diff-if-necessary n) + (ediff-set-fine-diff-properties n 'default)) ) (message "") (ediff-unselect-and-select-difference n) @@ -2821,7 +2825,7 @@ (defun ediff-unselect-difference (n) (setq ediff-highlighting-style nil) ;; unhighlight fine diffs - (ediff-set-fine-diff-properties ediff-current-difference 'default) + (ediff-set-fine-diff-properties n 'default) (run-hooks 'ediff-unselect-hook))))