2003-10-12 Michael Kifer <[email protected]>

	* ediff-mult.el (ediff-filegroup-action): use
	ediff-default-filtering-regexp.

	* ediff-util.el (ediff-recenter): don't call
	ediff-restore-highlighting twice.
	(ediff-select-difference): set current difference.
	(ediff-unselect-and-select-difference): added comment.

	* ediff.el (ediff-directories,ediff-directory-revisions,
	ediff-directories3,ediff-merge-directories,
	ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
	ediff-merge-directory-revisions-with-ancestor): use
	ediff-default-filtering-regexp.

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index c4f8ae5265..d69997394e 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -826,7 +826,8 @@ Reestablish the default three-window display."
 		 (eq this-command 'ediff-quit))))
 	  ))
 
-    (ediff-restore-highlighting)
+    (or no-rehighlight
+	(ediff-restore-highlighting))
     (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
     ))
 
@@ -2940,6 +2941,8 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 	     ))
 
 	(ediff-install-fine-diff-if-necessary n)
+	;; set current difference here so the hook will be able to refer to it
+	(setq ediff-current-difference n)
 	(run-hooks 'ediff-select-hook))))
 
 
@@ -2991,6 +2994,9 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 
 	  (or (eq flag 'unselect-only)
 	      (ediff-select-difference n))
+	  ;; need to set current diff here even though it is also set in
+	  ;; ediff-select-difference because ediff-select-difference might not
+	  ;; be called if unselect-only is specified
 	  (setq ediff-current-difference n)
 	  ) ; end protected section