]> git.eshelyaron.com Git - emacs.git/commit
Ediff's overlay priorities cause more trouble than they solve.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Apr 2014 19:15:01 +0000 (15:15 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Apr 2014 19:15:01 +0000 (15:15 -0400)
commite46561a27ef859132775e8025468ad5bf3cbab47
treeaff1722fe369e5ea584b5f3240834b3ba1b97b3e
parent10ee3b3f17731f44b9d5bd51c8330e16f22361c7
Ediff's overlay priorities cause more trouble than they solve.
* lisp/vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
(ediff-highest-priority): Remove function.
* lisp/vc/ediff-util.el (ediff-highlight-diff-in-one-buffer):
* lisp/vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer)
(ediff-set-fine-diff-properties-in-one-buffer): Don't mess with
overlay priorities.

Fixes: debbugs:17234
lisp/ChangeLog
lisp/vc/ediff-diff.el
lisp/vc/ediff-init.el
lisp/vc/ediff-util.el