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-diff.el | |
| parent | 10ee3b3f17731f44b9d5bd51c8330e16f22361c7 (diff) | |
| download | emacs-e46561a27ef859132775e8025468ad5bf3cbab47.tar.gz emacs-e46561a27ef859132775e8025468ad5bf3cbab47.tar.bz2 emacs-e46561a27ef859132775e8025468ad5bf3cbab47.zip | |
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-diff.el')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 96e8acca294..f429eb35d70 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -587,7 +587,6 @@ one optional arguments, diff-number to refine.") (setq pt-saved (ediff-with-current-buffer buff (point))))) (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) - (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority) (ediff-overlay-put overlay 'ediff-diff-num current-diff) (if (and (ediff-has-face-support-p) ediff-use-faces ediff-highlight-all-diffs) @@ -822,20 +821,9 @@ one optional arguments, diff-number to refine.") 'default (ediff-get-symbol-from-alist buf-type ediff-fine-diff-face-alist) - )) - (priority (if default - 0 - (1+ (or (ediff-overlay-get - (symbol-value - (ediff-get-symbol-from-alist - buf-type - ediff-current-diff-overlay-alist)) - 'priority) - 0))))) - (mapcar (lambda (overl) - (ediff-set-overlay-face overl face) - (ediff-overlay-put overl 'priority priority)) - fine-diff-vector))) + ))) + (dolist (overl fine-diff-vector) + (ediff-set-overlay-face overl face)))) ;; Set overlays over the regions that denote delimiters (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) |