Re: ediff output

Re: ediff output

[Stefan Monnier]

> 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.


        Stefan

Re: ediff output

[Leo]

* Stefan Monnier (2006-12-13 10:45 -0500) said:
  ^^^^^^^^^^^^^^
> 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.
>
>
>         Stefan

Indeed. Thank you, Stefan.

-- 
Leo <sdl.web AT gmail.com>                         (GPG Key: 9283AA3F)

Re: ediff output

[Michael Kifer]

> * William Karh (2006-12-14 01:55 +0000) said:
>
> >> So I set ediff-diff-options to "-u". However typing `D' in ediff panel
> >> still generate the output in a format like:
> >> [snip]
> >
> > try customizing "ediff-custom-diff-options" instead.
> 
> Thank you.
> 
> BTW, do you think the doc string for ediff-custom-diff-options and
> ediff-diff-options are not clear enough?

Yes, will clarify the doc string - thanks.


	--michael  

> 
> - -- 
> Leo <sdl.web AT gmail.com>                         (GPG Key: 9283AA3F)

ediff output

[Leo]

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?

-- 
Leo <sdl.web AT gmail.com>                         (GPG Key: 9283AA3F)

Re: ediff output

[William Karh]

Leo <sdl.web <at> gmail.com> writes:

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

try customizing "ediff-custom-diff-options" instead.

Re: ediff output

[Leo]

* William Karh (2006-12-14 01:55 +0000) said:
  ^^^^^^^^^^^^
>> So I set ediff-diff-options to "-u". However typing `D' in ediff panel
>> still generate the output in a format like:
>> [snip]
>
> try customizing "ediff-custom-diff-options" instead.

Thank you.

BTW, do you think the doc string for ediff-custom-diff-options and
ediff-diff-options are not clear enough?

-- 
Leo <sdl.web AT gmail.com>                         (GPG Key: 9283AA3F)