diff -u -F'defun' /export/home1/sl/local/share/emacs/20.7/lisp/ /export/home1/sl/local/share/emacs/20.7/site-lisp/ediff-init.el
--- /export/home1/sl/local/share/emacs/20.7/lisp/ediff-init.el	Thu Nov 12 01:54:52 1998
+++ /export/home1/sl/local/share/emacs/20.7/site-lisp/ediff-init.el	Tue Jul  3 10:10:36 2001
@@ -1156,7 +1156,7 @@ (defun ediff-highest-priority (start end
 	(while (< pos (min (point-max) (1+ end)))
 	  (setq ovr-list (append (overlays-at pos) ovr-list))
 	  (setq pos (next-overlay-change pos)))
-	(1+ (apply '+
+	(1+ (apply 'max
 		   (mapcar (function
 			    (lambda (ovr)
 			      (if ovr
@@ -1315,12 +1315,12 @@ (defun ediff-highlight-diff-in-one-buffe
 	      (symbol-value
 	       (ediff-get-symbol-from-alist
 		buf-type ediff-current-diff-overlay-alist))))
-	
+
+	(ediff-overlay-put current-diff-overlay 'priority  
+			   (ediff-highest-priority begin end-hilit buff))
 	(if ediff-xemacs-p
 	    (ediff-move-overlay current-diff-overlay begin end-hilit)
 	  (ediff-move-overlay current-diff-overlay begin end-hilit buff))
-	(ediff-overlay-put current-diff-overlay 'priority  
-			   (ediff-highest-priority begin end-hilit buff))
 	(ediff-overlay-put current-diff-overlay 'ediff-diff-num n)
 	
 	;; unhighlight the background overlay for diff n so it won't