* Re: ediff output
[not found] <mailman.1811.1165973042.2155.help-gnu-emacs@gnu.org>
@ 2006-12-13 15:45 ` Stefan Monnier
2006-12-13 16:47 ` Leo
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Monnier @ 2006-12-13 15:45 UTC (permalink / raw)
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: ediff output
2006-12-13 15:45 ` ediff output Stefan Monnier
@ 2006-12-13 16:47 ` Leo
0 siblings, 0 replies; 6+ messages in thread
From: Leo @ 2006-12-13 16:47 UTC (permalink / raw)
* 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)
^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <sdl.web@gmail.com>]
* Re: ediff output
[not found] <sdl.web@gmail.com>
@ 2006-12-17 23:35 ` Michael Kifer
0 siblings, 0 replies; 6+ messages in thread
From: Michael Kifer @ 2006-12-17 23:35 UTC (permalink / raw)
Cc: help-gnu-emacs
> * 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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* ediff output
@ 2006-12-13 1:23 Leo
2006-12-14 1:55 ` William Karh
0 siblings, 1 reply; 6+ messages in thread
From: Leo @ 2006-12-13 1:23 UTC (permalink / raw)
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)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-12-17 23:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <mailman.1811.1165973042.2155.help-gnu-emacs@gnu.org>
2006-12-13 15:45 ` ediff output Stefan Monnier
2006-12-13 16:47 ` Leo
[not found] <sdl.web@gmail.com>
2006-12-17 23:35 ` Michael Kifer
2006-12-13 1:23 Leo
2006-12-14 1:55 ` William Karh
2006-12-14 2:40 ` Leo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).