all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: help-gnu-emacs@gnu.org
Subject: Re: Refining ediff's idea of a difference?
Date: Sat, 31 Jan 2015 09:17:42 +0200	[thread overview]
Message-ID: <83a90zl8q1.fsf@gnu.org> (raw)
In-Reply-To: <155DEC68569B714B86C2C7075F5EDA9892BC08A0@DAKIYA1.pegasus.local>

> From: Doug Lewan <dougl@shubertticketing.com>
> Date: Fri, 30 Jan 2015 23:11:41 +0000
> 
> Using ediff I find that very often one difference one difference seems inappropriately large and might obscure a small difference.
> 
> In the example at hand I have the two following diffs:
> 
>     <<<< A
>      -clrobj server_info_blk -fid server_info_begin_time  -val 2015-01-29 15:28:47
>     >>>> B
>      -clrobj server_info_blk -fid server_info_begin_time  -val 2015-01-29 15:27:28
>     -fid server_info_reply_que  -val 
>     -fid server_info_tran_msg_type  -val 
>     -fid server_info_tran_id  -val 
>     -fid server_info_seq_msg_type  -val 
>     -fid server_info_seq_id  -val 
>     ...
> 
> The lines following diff A are these
>     <<<< A
>     -fid server_info_reply_que  -val 
>     -fid server_info_tran_msg_type  -val 
>     -fid server_info_tran_id  -val 
>     -fid server_info_seq_msg_type  -val 
>     -fid server_info_seq_id  -val 
> which look, to my eye, identical to those flagged as different in diff B.
> 
> I'd rather those lines are recognized as identical, so the diff is minimal. Is there a conventional way to do that?

Ediff just obeys here what the Diff utility outputs.  So try playing
with Diff switches, like -d, -b, -B, -w, --horizon-lines.

> I haven't found anything obvious in ediff customization. Browsing the code didn't reveal much more than the fact that ediff seems to use diff with no options. It clearly does more with that information.

The relevant defcustom is ediff-diff-options.



  reply	other threads:[~2015-01-31  7:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-30 23:11 Refining ediff's idea of a difference? Doug Lewan
2015-01-31  7:17 ` Eli Zaretskii [this message]
2015-02-03 15:49   ` Doug Lewan

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=83a90zl8q1.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=help-gnu-emacs@gnu.org \
    /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.