all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kevin Rodgers <ihs_4664@yahoo.com>
Subject: Re: ediff customization: -w -B... + refinement
Date: Wed, 04 Oct 2006 09:49:00 -0600	[thread overview]
Message-ID: <eg0l6n$rhf$1@sea.gmane.org> (raw)
In-Reply-To: <uzmccmcu4.fsf@gmail.com>

Peter Tury wrote:
> I see different results in Emacs ediff and out-of-emacs command line
> diff.
> 
> I try to get rid of white space and new line diffs, so I tried diff -a
> -w -B --binary ... It produces the desired output in command line, but
> whitespace- and newline-differences are showed (and treated) in
> Emacs. Why? I set ediff-diff-options to "-a -w -B --binary", but it
> seems to be ignored? Why? How to get rid of such whitespace diffs? I
> tried ##, but nothing changed.
> 
> How can check what command was exactly sent by Emacs (to
> Windows/diff)? (If I check *ediff-diff*'s content, it is "wrong",
> i.e. shows result without -w -B...) And what diff is used? (I have an old
> diff also in my path, but I put the directory of the new diff before
> that old one's directory in the path variable.)

To see what diff program is used:

M-: (executable-find ediff-diff-program)

I don't think you can find out after the fact what command was run,
but you could see which options are used dynamically by examining the
4th argument passed to ediff-exec-process:

M-x debug-on-entry RET ediff-exec-process

Looking at its source code in ediff-diff.el, I find:

     ;; the --binary option, if present, should be used only for buffer jobs
     ;; or for refining the differences
     (or (string-match "buffer" (symbol-name ediff-job-name))
	(eq buffer ediff-fine-diff-buffer)
	(setq args (delete "--binary" args)))

So maybe you need to use M-x ediff-buffers instead of M-x ediff-files
to use the --binary option.

> My other question: what to do if I want refinement to show differences
> by chars and not by words?

Try: (setq ediff-forward-word-function 'forward-char)

> These makes ediff unusable for me now, because emacs shows totally
> wrong lines compared. E.g. if an empty line is deleted and following
> lines are reindented then I see (in ediff's windows) as if the
> (original) empty line would have been replaced with several new lines
> (what are in fact only reindented) and then the original lines are
> compared with other lines... :-( I think this is diff's feature, but
> can be handled in command line with switches -w -B -- but not in
> Emacs?

-- 
Kevin

  reply	other threads:[~2006-10-04 15:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-04 13:26 ediff customization: -w -B... + refinement Peter Tury
2006-10-04 15:49 ` Kevin Rodgers [this message]
     [not found] ` <mailman.7727.1159977183.9609.help-gnu-emacs@gnu.org>
2006-10-04 22:14   ` tury.peter
2006-10-05  6:58     ` Peter Tury
2006-10-05 15:35     ` Kevin Rodgers

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='eg0l6n$rhf$1@sea.gmane.org' \
    --to=ihs_4664@yahoo.com \
    /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.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.