diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-09-09 22:33:38 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-09-09 22:33:38 +0000 |
| commit | 02f34c7046309acb4772efc0d847a93e752f5b4e (patch) | |
| tree | 1475778284148b185e5fda55d7e83a86cbbf33f6 /lisp/ediff-init.el | |
| parent | cfc697a2beffc0b0e50e83609cc86df0ec306330 (diff) | |
| download | emacs-02f34c7046309acb4772efc0d847a93e752f5b4e.tar.gz | |
2001-09-09 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-init.el (ediff-highest-priority): bug fix.
* viper-cmd.el (viper-special-read-and-insert-char): new function
that reads a character and uses the current input method or
iso-accents when appropriate.
* viper.el and all others: corrections to the comment blocks at
the top.
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) + ) )) )))) |