Mercurial > emacs
diff lisp/ediff-diff.el @ 87678:ae3fe9150b36
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*.el: commented out declare-function. "make bootstrap"
stops with an error and emacs does not compile with those things in.
Besides, declare-function is not defined in XEmacs.
* ediff-util (eqiff-quit): autoraise minibuffer.
* ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin
* viper*.el: commented out declare-function -- not defined in XEmacs.
* viper-ex.el (viper-info-on-file): take care of indiret buffers.
* viper.el (viper-set-hooks, set-cursor-color): set viper-vi-state-cursor-color.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Wed, 09 Jan 2008 06:16:07 +0000 |
| parents | 107ccd98fa12 |
| children | c70e45a7acfd 50e6d60be93b |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Wed Jan 09 06:15:40 2008 +0000 +++ b/lisp/ediff-diff.el Wed Jan 09 06:16:07 2008 +0000 @@ -948,7 +948,7 @@ ))) -(defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num) +(defun ediff-convert-fine-diffs-to-overlays (diff-list region-num) (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num) (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num) (if ediff-3way-job