diff options
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index fa8e0e9b794..b701ae6685f 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1202,18 +1202,21 @@ this variable represents.") (setq pos (next-overlay-change pos))) (+ 1 ediff-shadow-overlay-priority (apply 'max - (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) + (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) + ) )) )))) |