• Michael Kifer's avatar
    2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu> · 2d84cc27
    Michael Kifer authored
    	* 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.
    2d84cc27
ediff-vers.el 8.05 KB