CVS update by michaelk packages/xemacs-packages/ediff, ediff-vers.el, ediff-ptch.el, ediff-init.el, ediff-diff.el ...

[Norbert Koch]

* xemacs-cvs at xemacs.org:

Michael, 

this breaks the build

>   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.


  # bind (file)
  batch-byte-compile-1("ediff-diff.el")
  # bind (error file-to-process)
  batch-byte-compile-one-file()
  # bind (error)
  batch-byte-compile()
  # bind (arg)
  command-line-do-funcall("-f")
  # bind (dir file-count line end-of-options file-p arg tem)
  command-line-1()
  # bind (command-line-args-left)
  command-line()
  # (condition-case ... . ((t (byte-code "	‡" ... 1))))
  # bind (error-data)
  normal-top-level()
  # (condition-case ... . error)
  # (catch top-level ...)
>>Error occurred processing ediff-diff.el: 
Wrong number of arguments: require, 3


Done
make: *** [ediff-diff.elc] Error 1

Compilation exited abnormally with code 2 at Fri Apr  4 12:37:32