Bug in ediff-diff.el?

[Bo Lin]

Hi all.
  I don't know if anyone's noticed, but there seems to be a bug in the
current CVS HEAD version of lisp/ediff-diff.el(revision 1.50).
  In the function `ediff-setup-diff-regions', line 254:

;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options
  (if (string-match "^-[ci]\\| -[ci]\\|-[^- ]+[ci]" ediff-diff-options)
      (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'"))

 The problem is that the last part of the regexp("-[^- ]+[ci]") used
to "look for a 'c', 'i' among clustered non-long options" will
actually match 'c' 'i's in long options such as "--binary", thus
generating an error and halt the execution of ediff commands. Changing
the regexp to "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]" seems to fix
the problem.

Cheers,
Bo