Re: pcl-cvs misbehaving

[Stefan Monnier]

> I see a file labelled "need-merge", so I do `d E' and get:

`d E' doesn't "merge" changes, it helps resolve conflicts that appeared
during an earlier merge.  It's a common misunderstanding (i.e. a misfeature
of PCL-CVS's UI) and at least the error message should be improved.

> ediff-setup: Wrong number of arguments: (lambda (type) "A mode to do basic 
> comment and font-lock functionality 

The problem is that ediff-setup does:

              (insert-buffer buf)
              (funcall (ediff-with-current-buffer buf major-mode))
              (widen) ; merge buffer is always widened

thus assuming that the function stored in `major-mode' can be called with
no arguments.  This should indeed be the case (see the elisp manual snippet
I quoted earlier today in the context of org-mode and define-derived-mode).
So I guess the error is in generic-x.el since it sets major-mode to
`generic-mode' which is not a valid major mode function.


        Stefan