[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ediff output

From: Stefan Monnier
Subject: Re: ediff output
Date: Wed, 13 Dec 2006 10:45:28 -0500
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.91 (gnu/linux)

> I like the difference output to be in the format as:
>    +++ /tmp/buffer-content-3035240a
>    @@ -1669,22 +1669,25 @@
>     Due to some yet unresolved reason, global function `iswitchb-mode'
>     needs to be active for this function to work."
>       (interactive "P")
>    -  (eval-and-compile
>    +  (eval-when-compile

> So I set ediff-diff-options to "-u". However typing `D' in ediff panel
> still generate the output in a format like:

>    *** 1669,22 ****
>    ! (eval-and-compile)  
>    --- 1669,25 ----
>    ! (eval-when-compile)

> Any ideas?

There's a bug in the docstring of ediff-diff-options: it only mentions "-c"
as not allowed, but -u is not allowed either IIUC.  These options are those
used internally by ediff to compute the highlighting and things like that.
The options that affect the display of patches are configured in another
variable.  I believe it's ediff-custom-diff-options.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]