Ediff's overlay priorities cause more trouble than they solve.

[gnu-emacs] / lisp / vc / ediff-util.el

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 127e6b2cfc056a8a6ef21be52bddc4545aeff718..649ef8840596467fc0fd8407dcef1c4ee7d508f9 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3023,8 +3023,6 @@ Hit \\[ediff-recenter] to reset the windows afterward."
        (if (featurep 'xemacs)
            (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