From: Stefan Monnier <monnier@iro.umontreal.ca>
Subject: Re: ediff output
Date: Wed, 13 Dec 2006 10:45:28 -0500 [thread overview]
Message-ID: <jwvodq7x0om.fsf-monnier+gnu.emacs.help@gnu.org> (raw)
In-Reply-To: mailman.1811.1165973042.2155.help-gnu-emacs@gnu.org
> 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
next parent reply other threads:[~2006-12-13 15:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <mailman.1811.1165973042.2155.help-gnu-emacs@gnu.org>
2006-12-13 15:45 ` Stefan Monnier [this message]
2006-12-13 16:47 ` ediff output 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvodq7x0om.fsf-monnier+gnu.emacs.help@gnu.org \
--to=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).