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-init.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-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 000fdb916e3..f3781c53885 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -707,9 +707,6 @@ shown in brighter colors." ;; List of difference overlays disturbed by working with the current diff. (defvar ediff-disturbed-overlays nil "") -;; Priority of non-selected overlays. -(defvar ediff-shadow-overlay-priority 100 "") - (defcustom ediff-version-control-package 'vc "Version control package used. Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The @@ -1329,34 +1326,6 @@ this variable represents.") (ediff-defvar-local ediff-current-diff-overlay-Ancestor nil "Overlay for the current difference region in the ancestor buffer.") -;; Compute priority of a current ediff overlay. -(defun ediff-highest-priority (start end buffer) - (let ((pos (max 1 (1- start))) - ovr-list) - (if (featurep 'xemacs) - (1+ ediff-shadow-overlay-priority) - (ediff-with-current-buffer buffer - (while (< pos (min (point-max) (1+ end))) - (setq ovr-list (append (overlays-at pos) ovr-list)) - (setq pos (next-overlay-change pos))) - (+ 1 ediff-shadow-overlay-priority - (apply 'max - (cons - 1 - (mapcar - (lambda (ovr) - (if (and ovr - ;; exclude ediff overlays from priority - ;; calculation, or else priority will keep - ;; increasing - (null (ediff-overlay-get ovr 'ediff)) - (null (ediff-overlay-get ovr 'ediff-diff-num))) - ;; use the overlay priority or 0 - (or (ediff-overlay-get ovr 'priority) 0) - 0)) - ovr-list)))))))) - - (defvar ediff-toggle-read-only-function 'toggle-read-only "Function to be used to toggle read-only status of the buffer. If nil, Ediff tries using the command bound to C-x C-q.") |