2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
authorMichael Kifer <kifer@cs.stonybrook.edu>
Fri, 4 Apr 2008 07:51:27 +0000 (07:51 +0000)
committerMichael Kifer <kifer@cs.stonybrook.edu>
Fri, 4 Apr 2008 07:51:27 +0000 (07:51 +0000)
commit2d84cc270a12a939502497ad4d56371e9562a98d
tree2553dc74513fea235847a7b9cfed0ca90d30880b
parentd80c2c18c1fe064185ffbab1d0fc3ad4fd7f89c5
2008-04-04  Michael Kifer  <kifer@cs.stonybrook.edu>

* ediff*el: replaced load with require in eval-when-compile.

* ediff-hook: deleted all invocations of (autoload ...).

* ediff-util.el (ediff-setup): make window-min-height a local variable
in ediff control window, and set its min height to 2.
(ediff-setup-control-buffer): dedicate the control window.
(ediff-toggle-multiframe): undedicate control window.
Work directly with ediff-setup-windows-multiframe and
ediff-setup-windows-plain.

* ediff-wind (ediff-choose-window-setup-function-automatically): new
function.
(ediff-window-setup-function): change initialization.
(ediff-setup-windows-automatic): deleted.
(ediff-setup-windows-plain-merge): make control window dedicated.
(ediff-destroy-control-frame): do not skip frames if working in a
single frame.

* emulation/viper-ex.el: move provide's forward, prevent ecursion in
eval-when-compile.

* emulation/viper-util.el: move provide's forward, prevent ecursion in
eval-when-compile.
14 files changed:
lisp/ChangeLog
lisp/ediff-diff.el
lisp/ediff-help.el
lisp/ediff-hook.el
lisp/ediff-init.el
lisp/ediff-merg.el
lisp/ediff-mult.el
lisp/ediff-ptch.el
lisp/ediff-util.el
lisp/ediff-vers.el
lisp/ediff-wind.el
lisp/ediff.el
lisp/emulation/viper-ex.el
lisp/emulation/viper-util.el