This doesn't happen when doing a direct ediff, only when using `d E'
from a *cvs* buffer on a file with a conflict.  And it only happens on
files whose mode is jam-mode as set via

  (setq auto-mode-alist
      (append '( ("\\.jam$" . jam-mode) )
       auto-mode-alist))

with the enclosed jam-mode.el... which relies on the enclosed
generic-mode.el.  I'm not adept enough with elisp to see what's going
on through the macro invocation and whatever other magic is going on.
In particular, I don't know what's invoking generic-mode, so I haven't
been able to debug this or provide a patch.  Any help you can offer
would be deeply appreciated.

Thanks,
Dave