From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing Date: Sat, 03 May 2014 09:48:27 +0300 Message-ID: <83a9az1hok.fsf@gnu.org> References: <87wqe43t55.fsf@rosalinde.fritz.box> <111c9271-6a23-426e-adb2-ff5520c02806@default> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1399099764 11476 80.91.229.3 (3 May 2014 06:49:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 3 May 2014 06:49:24 +0000 (UTC) Cc: 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu To: Drew Adams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 03 08:49:17 2014 Return-path: Envelope-to: geb-bug-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 1WgTl6-0005S9-36 for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 May 2014 08:49:16 +0200 Original-Received: from localhost ([::1]:47717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgTl5-0004r6-I4 for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 May 2014 02:49:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgTkx-0004r1-OQ for bug-gnu-emacs@gnu.org; Sat, 03 May 2014 02:49:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgTkt-0004CF-1R for bug-gnu-emacs@gnu.org; Sat, 03 May 2014 02:49:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgTks-0004CA-UQ for bug-gnu-emacs@gnu.org; Sat, 03 May 2014 02:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WgTkr-0005Rj-Ta for bug-gnu-emacs@gnu.org; Sat, 03 May 2014 02:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 May 2014 06:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17388 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17388-submit@debbugs.gnu.org id=B17388.139909970220858 (code B ref 17388); Sat, 03 May 2014 06:49:01 +0000 Original-Received: (at 17388) by debbugs.gnu.org; 3 May 2014 06:48:22 +0000 Original-Received: from localhost ([127.0.0.1]:49053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgTkD-0005QL-AX for submit@debbugs.gnu.org; Sat, 03 May 2014 02:48:21 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:51260) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgTk7-0005Q1-VL for 17388@debbugs.gnu.org; Sat, 03 May 2014 02:48:17 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0N4Z00100KA4JL00@mtaout29.012.net.il> for 17388@debbugs.gnu.org; Sat, 03 May 2014 09:49:23 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N4Z00H7IKAA5P80@mtaout29.012.net.il>; Sat, 03 May 2014 09:49:23 +0300 (IDT) In-reply-to: <111c9271-6a23-426e-adb2-ff5520c02806@default> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:88571 Archived-At: > Date: Fri, 2 May 2014 20:11:54 -0700 (PDT) > From: Drew Adams > Cc: 17388-done@debbugs.gnu.org, Michael Kifer > > There should be EITHER, (a) as previously, NO fine diffs shown for > other than the current diff OR (b) CORRECT (helpful) fine diffs > shown for the non-current diffs. Ediff's "fine diffs" are word-granular. That is, Ediff breaks each line into "words", then passes the result to the Diff program for comparisoon, and reflects the results with different faces. AFAIR, this has always been that way. The Ediff manual says: `ediff-forward-word-function' This variable controls how fine differences are computed. The value must be a Lisp function that determines how the current difference region should be split into words. Fine differences are computed by first splitting the current difference region into words and then passing the result to `ediff-diff-program'. For the default forward word function (which is `ediff-forward-word'), a word is a string consisting of letters, `-', or `_'; a string of punctuation symbols; a string of digits, or a string consisting of symbols that are neither space, nor a letter. This default behavior is controlled by four variables: `ediff-word-1', ..., `ediff-word-4'. See the on-line documentation for these variables and for the function `ediff-forward-word' for an explanation of how to modify these variables. I think what you describe in your item #2 is exactly the above behavior. (The problem described under #1 is now fixed by Stefan.) > Stephen Berman's confirmation indicates that Cygwin `diff' is > irrelevant: > > > I see both of these problematic highlightings on GNU/Linux builds from > > both the trunk (bzr 117042) and the emacs-24 branch (bzr 117049). I can confirm that too, but (a) I don't think the 2nd issue constitutes a "problem" (see above), and (b) it is definitely not a "REGRESSION", because older Emacsen behaved the same wrt fine diffs inside a line.