From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.help Subject: Re: Refining ediff's idea of a difference? Date: Sat, 31 Jan 2015 09:17:42 +0200 Message-ID: <83a90zl8q1.fsf@gnu.org> References: <155DEC68569B714B86C2C7075F5EDA9892BC08A0@DAKIYA1.pegasus.local> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1422688680 21756 80.91.229.3 (31 Jan 2015 07:18:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 31 Jan 2015 07:18:00 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat Jan 31 08:18:00 2015 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YHSJb-00022m-18 for geh-help-gnu-emacs@m.gmane.org; Sat, 31 Jan 2015 08:17:59 +0100 Original-Received: from localhost ([::1]:39882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHSJZ-0001Pk-Uf for geh-help-gnu-emacs@m.gmane.org; Sat, 31 Jan 2015 02:17:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHSJP-0001PX-Cx for help-gnu-emacs@gnu.org; Sat, 31 Jan 2015 02:17:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHSJM-00080N-7N for help-gnu-emacs@gnu.org; Sat, 31 Jan 2015 02:17:47 -0500 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:49932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHSJL-00080H-Ve for help-gnu-emacs@gnu.org; Sat, 31 Jan 2015 02:17:44 -0500 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NJ100E00513IM00@mtaout28.012.net.il> for help-gnu-emacs@gnu.org; Sat, 31 Jan 2015 09:15:53 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NJ100BQS5IHZH40@mtaout28.012.net.il> for help-gnu-emacs@gnu.org; Sat, 31 Jan 2015 09:15:53 +0200 (IST) In-reply-to: <155DEC68569B714B86C2C7075F5EDA9892BC08A0@DAKIYA1.pegasus.local> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:102393 Archived-At: > From: Doug Lewan > 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.