diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-10 15:15:01 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-04-10 15:15:01 -0400 |
| commit | e46561a27ef859132775e8025468ad5bf3cbab47 (patch) | |
| tree | aff1722fe369e5ea584b5f3240834b3ba1b97b3e /lisp/vc/ediff-util.el | |
| parent | 10ee3b3f17731f44b9d5bd51c8330e16f22361c7 (diff) | |
| download | emacs-e46561a27ef859132775e8025468ad5bf3cbab47.tar.gz | |
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
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 127e6b2cfc0..649ef884059 100644 --- 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 |