Bug in ediff-diff.el?

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

Re: Bug in ediff-diff.el?

[Alex Lancaster]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 1508 bytes --]

>>>>> "BL" == Bo Lin  writes:

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

[...]

Bo,

I'm not sure if it's related but I have noticed a bug in ediff in CVS
HEAD *after* I'm quiting the ediff browser.  (I tried your fix above,
but it had no effect).

To reproduce:

1. open up a file that's under CVS control (such as ediff-diff.el
   itself).  

2. ediff-revision

3. For revision 1 to compare (accept default)

4. For revision 2 to compare (enter a value such as 1.49 for
   ediff-diff.el)

5. Quit the little "Ediff" "browser" window that appears with the list
   of diffs

At this point get the error message (and the diff buffers don't disappear):

"Wrong number of arguments: #<subr enlarge-window>, 3"

Debugger backtrace:

Debugger entered--Lisp error: (wrong-number-of-arguments #<subr enlarge-window> 3)
  enlarge-window(0 nil t)
  #[(w) ".\b!.\b	.A.\x1a.!.Å\n. Z.È#.Æ \nU?.!.Ç.\x13)." [w newsizes newsize done select-window enlarge-window window-height nil t] 5](#<window 8 on ediff-diff.el.~1.50~>)
  walk-windows(#[(w) ".\b!.\b	.A.\x1a.!.Å\n. Z.È#.Æ \nU?.!.Ç.\x13)." [w newsizes newsize done select-window enlarge-window window-height nil t] 5] nomini)
  balance-windows()
  ediff-cleanup-mess()
  run-hooks(ediff-quit-hook)
  ediff-really-quit(nil)
  ediff-quit(nil)
  call-interactively(ediff-quit)