User: michaelk Date: 08/04/04 10:06:16 Modified: packages/xemacs-packages/ediff ediff.el ediff-wind.el ediff-vers.el ediff-util.el ediff-tbar.el ediff-ptch.el ediff-mult.el ediff-merg.el ediff-init.el ediff-hook.el ediff-help.el ediff-diff.el ChangeLog Log: * 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.

>Error occurred processing ediff-diff.el: