From unknown Sat Aug 16 21:17:53 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#17388 <17388@debbugs.gnu.org> To: bug#17388 <17388@debbugs.gnu.org> Subject: Status: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing Reply-To: bug#17388 <17388@debbugs.gnu.org> Date: Sun, 17 Aug 2025 04:17:53 +0000 retitle 17388 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diff= ing reassign 17388 emacs submitter 17388 Drew Adams severity 17388 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Fri May 02 11:15:52 2014 Received: (at submit) by debbugs.gnu.org; 2 May 2014 15:15:52 +0000 Received: from localhost ([127.0.0.1]:48567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgFBn-0006nB-7t for submit@debbugs.gnu.org; Fri, 02 May 2014 11:15:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41100) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgFBk-0006mm-5q for submit@debbugs.gnu.org; Fri, 02 May 2014 11:15:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgFBU-0006Xr-Cn for submit@debbugs.gnu.org; Fri, 02 May 2014 11:15:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:56832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgFBU-0006Xl-3Z for submit@debbugs.gnu.org; Fri, 02 May 2014 11:15:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgFBL-0004cu-0z for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 11:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgFBB-0006Sc-U6 for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 11:15:22 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:36950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgFBB-0006SD-IZ for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 11:15:13 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s42FFBqC018178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 2 May 2014 15:15:11 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s42FFALZ024751 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 2 May 2014 15:15:10 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s42FF9PO018309 for ; Fri, 2 May 2014 15:15:09 GMT MIME-Version: 1.0 Message-ID: Date: Fri, 2 May 2014 08:15:09 -0700 (PDT) From: Drew Adams To: bug-gnu-emacs@gnu.org Subject: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.8 (707110) [OL 12.0.6691.5000 (x86)] Content-Type: multipart/mixed; boundary="__1399043709718211050abhmp0012.oracle.com" X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --__1399043709718211050abhmp0012.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 1. A diff that is not the current one should use face `ediff-(odd|even)-diff-(A|B'). This is now broken. It does use that face for the main diff, but it still tries to show fine differences within that diff - which is new. That would be OK, I guess, but it should not use face `default' to show such fine diffs. It should use an Ediff face, which users can customize without affecting other things (as happens with `default'). Using face `default' here is particular misguided, as it suggests that there is no difference at those locations, whereas there likely is. See the attached screenshot. The first diff shown, with the gray highlighting, shows the regression. =20 2. The fine diffs are also not correct. See the same screenshot. For the first diff, "advertise" and "d-signature-table" should be highlighted the same as "(defvar " and ")", and for the second diff, "fil" and "s-alist" should be highlighted the same as "(defvar " and ")". These are not differences. I am using Cygwin `diff', which could affect #2 presumably. But #2 is still a regression wrt prior Emacs versions. With Emacs 24.3, for instance (using the same Cygwin `diff'), there is no fine diff shown here. Instead, the diff, which is shown only as a main diff, is between "file-local-variables-alist" and "filxxxxxxxxxxxxxxxxxxxxxs-alist". Which is correct. Emacs should not show fine diffs that are are patently wrong. Better not to mislead. In GNU Emacs 24.4.50.1 (i686-pc-mingw32) of 2014-04-29 on ODIEONE Bzr revision: 117031 monnier@iro.umontreal.ca-20140429151607-qnkgbymwfaj5ut= 08 Windowing system distributor `Microsoft Corp.', version 6.1.7601 Configured using: `configure --prefix=3D/c/Devel/emacs/snapshot/trunk --enable-checking=3Dyes,glyphs 'CFLAGS=3D-O0 -g3' LDFLAGS=3D-Lc:/Devel/emacs/lib 'CPPFLAGS=3D-DGC_MCHECK=3D1 -Ic:/Devel/emacs/include'' --__1399043709718211050abhmp0012.oracle.com Content-Type: image/png; name="throw-emacs-bug-ediff.png" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="throw-emacs-bug-ediff.png" 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 G1e+AAAAAElFTkSuQmCC --__1399043709718211050abhmp0012.oracle.com-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 02 14:58:34 2014 Received: (at 17388) by debbugs.gnu.org; 2 May 2014 18:58:34 +0000 Received: from localhost ([127.0.0.1]:48695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgIfJ-0005aq-MK for submit@debbugs.gnu.org; Fri, 02 May 2014 14:58:33 -0400 Received: from mout.gmx.net ([212.227.15.15]:57550) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgIfH-0005ac-CF for 17388@debbugs.gnu.org; Fri, 02 May 2014 14:58:32 -0400 Received: from rosalinde.fritz.box ([89.245.97.102]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0LvPgd-1Wo23R36vL-010cC3; Fri, 02 May 2014 20:58:22 +0200 From: Stephen Berman To: Drew Adams Subject: Re: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: Date: Fri, 02 May 2014 20:57:58 +0200 In-Reply-To: (Drew Adams's message of "Fri, 2 May 2014 08:15:09 -0700 (PDT)") Message-ID: <87wqe43t55.fsf@rosalinde.fritz.box> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K0:APAJyzUrZnFwlfjccxq9BTE5no00iTZj1XxZAY9XNvmg+OIQyNE ctg0Nd2oz71Z8pugX26CmS3NbC2Z84aKbDF/m6mRPiuPWG7vq9RfOan+bmTw19C33q65/nK 87h+I85daes4l02rNjXD6RHkafeyIyppFYXTF3FuDoC9SpfwE1Ffd+4P5zigD1YooOIs9pj 8VfVA/RuZzZBFV2mxeRLw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 17388 Cc: 17388@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Fri, 2 May 2014 08:15:09 -0700 (PDT) Drew Adams wrote: > 1. A diff that is not the current one should use face > `ediff-(odd|even)-diff-(A|B'). This is now broken. > > It does use that face for the main diff, but it still tries to show fine > differences within that diff - which is new. That would be OK, I guess, > but it should not use face `default' to show such fine diffs. It should > use an Ediff face, which users can customize without affecting other > things (as happens with `default'). > > Using face `default' here is particular misguided, as it suggests that > there is no difference at those locations, whereas there likely is. > > See the attached screenshot. The first diff shown, with the gray > highlighting, shows the regression. > > > 2. The fine diffs are also not correct. See the same screenshot. For > the first diff, "advertise" and "d-signature-table" should be > highlighted the same as "(defvar " and ")", and for the second diff, > "fil" and "s-alist" should be highlighted the same as "(defvar " and > ")". These are not differences. > > I am using Cygwin `diff', which could affect #2 presumably. But #2 is > still a regression wrt prior Emacs versions. With Emacs 24.3, for > instance (using the same Cygwin `diff'), there is no fine diff shown > here. Instead, the diff, which is shown only as a main diff, is between > "file-local-variables-alist" and "filxxxxxxxxxxxxxxxxxxxxxs-alist". > Which is correct. > > Emacs should not show fine diffs that are are patently wrong. > Better not to mislead. > > > > In GNU Emacs 24.4.50.1 (i686-pc-mingw32) > of 2014-04-29 on ODIEONE > Bzr revision: 117031 monnier@iro.umontreal.ca-20140429151607-qnkgbymwfaj5ut08 > Windowing system distributor `Microsoft Corp.', version 6.1.7601 > Configured using: > `configure --prefix=/c/Devel/emacs/snapshot/trunk > --enable-checking=yes,glyphs 'CFLAGS=-O0 -g3' > LDFLAGS=-Lc:/Devel/emacs/lib 'CPPFLAGS=-DGC_MCHECK=1 > -Ic:/Devel/emacs/include'' I see both of these problematic highlightings on GNU/Linux builds from both the trunk (bzr 117042) and the emacs-24 branch (bzr 117049). Steve Berman From debbugs-submit-bounces@debbugs.gnu.org Fri May 02 22:28:05 2014 Received: (at 17388-done) by debbugs.gnu.org; 3 May 2014 02:28:05 +0000 Received: from localhost ([127.0.0.1]:48957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgPgK-0005hq-Oz for submit@debbugs.gnu.org; Fri, 02 May 2014 22:28:05 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:17711) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgPgH-0005hF-Qa for 17388-done@debbugs.gnu.org; Fri, 02 May 2014 22:28:02 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVPO+K9B/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMQCzQSFA0LDSQTh2UDCQjKXQ2HLxeMXoIcB4Q4BJZhjliDYIFqg0wh X-IPAS-Result: ArUGAIDvNVPO+K9B/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMQCzQSFA0LDSQTh2UDCQjKXQ2HLxeMXoIcB4Q4BJZhjliDYIFqg0wh X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="61375394" Received: from 206-248-175-65.dsl.teksavvy.com (HELO pastel.home) ([206.248.175.65]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 02 May 2014 22:27:55 -0400 Received: by pastel.home (Postfix, from userid 20848) id C32436004E; Fri, 2 May 2014 22:27:53 -0400 (EDT) From: Stefan Monnier To: Drew Adams Subject: Re: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing Message-ID: References: <87wqe43t55.fsf@rosalinde.fritz.box> Date: Fri, 02 May 2014 22:27:53 -0400 In-Reply-To: <87wqe43t55.fsf@rosalinde.fritz.box> (Stephen Berman's message of "Fri, 02 May 2014 20:57:58 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 17388-done Cc: 17388-done@debbugs.gnu.org, Michael Kifer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) >> See the attached screenshot. The first diff shown, with the gray >> highlighting, shows the regression. I installed the patch below which should fix those problems, thanks. >> 2. The fine diffs are also not correct. See the same screenshot. For >> the first diff, "advertise" and "d-signature-table" should be >> highlighted the same as "(defvar " and ")", and for the second diff, >> "fil" and "s-alist" should be highlighted the same as "(defvar " and >> ")". These are not differences. You mean you want finer granularity of fine diffs. >> still a regression wrt prior Emacs versions. With Emacs 24.3, for >> instance (using the same Cygwin `diff'), there is no fine diff shown >> here. Instead, the diff, which is shown only as a main diff, is between >> "file-local-variables-alist" and "filxxxxxxxxxxxxxxxxxxxxxs-alist". >> Which is correct. I don't see that here with Debian's Emacs-24.3, and neither with 23.4. The behavior you describe seems to correspond to ediff-word-mode, IIRC, so I assume this is not really a bug/regression but just a pilot error on your part. If not, feel free to re-open this bug report, providing more details about the problem. Stefan === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-05-02 11:11:35 +0000 +++ lisp/ChangeLog 2014-05-03 02:10:48 +0000 @@ -1,3 +1,13 @@ +2014-05-03 Stefan Monnier + + * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): + Use nil rather than `default' for the "default" appearance (bug#17388). + * vc/ediff-util.el (ediff-inferior-compare-regions) + (ediff-toggle-autorefine, ediff-unselect-difference): Don't use + a misleading `default' value when it's really a boolean. + * vc/ediff-init.el (ediff-set-overlay-face): Don't set help-echo if the + overlay is not visible. + 2014-05-02 Leo Liu * emacs-lisp/cl-macs.el (cl-deftype): Fix indentation. === modified file 'lisp/vc/ediff-diff.el' --- lisp/vc/ediff-diff.el 2014-04-14 02:21:12 +0000 +++ lisp/vc/ediff-diff.el 2014-05-03 01:49:01 +0000 @@ -818,10 +818,9 @@ n &optional default) (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type)) (face (if default - 'default + nil (ediff-get-symbol-from-alist - buf-type ediff-fine-diff-face-alist) - ))) + buf-type ediff-fine-diff-face-alist)))) (mapc (lambda (overl) (ediff-set-overlay-face overl face)) fine-diff-vector))) === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2014-04-10 19:15:01 +0000 +++ lisp/vc/ediff-init.el 2014-05-03 02:05:06 +0000 @@ -807,7 +807,7 @@ (defun ediff-set-overlay-face (extent face) (ediff-overlay-put extent 'face face) - (ediff-overlay-put extent 'help-echo 'ediff-region-help-echo)) + (ediff-overlay-put extent 'help-echo (if face 'ediff-region-help-echo))) (defun ediff-region-help-echo (extent-or-window &optional overlay _point) (unless overlay === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2014-04-10 19:15:01 +0000 +++ lisp/vc/ediff-util.el 2014-05-03 01:46:35 +0000 @@ -958,7 +958,7 @@ (message "Auto-refining is OFF") (setq ediff-auto-refine 'off)) (t ;; nix 'em - (ediff-set-fine-diff-properties ediff-current-difference 'default) + (ediff-set-fine-diff-properties ediff-current-difference t) (message "Refinements are HIDDEN") (setq ediff-auto-refine 'nix)) )) @@ -2973,7 +2973,7 @@ )) ;; unhighlight fine diffs - (ediff-set-fine-diff-properties ediff-current-difference 'default) + (ediff-set-fine-diff-properties ediff-current-difference t) (run-hooks 'ediff-unselect-hook)))) @@ -3492,7 +3492,7 @@ (if (ediff-valid-difference-p ediff-current-difference) (progn - (ediff-set-fine-diff-properties ediff-current-difference 'default) + (ediff-set-fine-diff-properties ediff-current-difference t) (ediff-unhighlight-diff))) (ediff-paint-background-regions 'unhighlight) From debbugs-submit-bounces@debbugs.gnu.org Fri May 02 23:12:11 2014 Received: (at 17388-done) by debbugs.gnu.org; 3 May 2014 03:12:11 +0000 Received: from localhost ([127.0.0.1]:48965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgQN0-00074z-Ku for submit@debbugs.gnu.org; Fri, 02 May 2014 23:12:11 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:22127) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgQMw-00074Q-Ok for 17388-done@debbugs.gnu.org; Fri, 02 May 2014 23:12:07 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s433BvoP026397 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 May 2014 03:11:58 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s433BtVk028120 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 3 May 2014 03:11:56 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s433BtJB029653; Sat, 3 May 2014 03:11:55 GMT MIME-Version: 1.0 Message-ID: <111c9271-6a23-426e-adb2-ff5520c02806@default> Date: Fri, 2 May 2014 20:11:54 -0700 (PDT) From: Drew Adams To: Stefan Monnier Subject: RE: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: <87wqe43t55.fsf@rosalinde.fritz.box> In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.8 (707110) [OL 12.0.6691.5000 (x86)] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 17388-done Cc: 17388-done@debbugs.gnu.org, Michael Kifer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) > >> See the attached screenshot. The first diff shown, with the gray > >> highlighting, shows the regression. >=20 > I installed the patch below which should fix those problems, thanks. >=20 > >> 2. The fine diffs are also not correct. See the same screenshot. For > >> the first diff, "advertise" and "d-signature-table" should be > >> highlighted the same as "(defvar " and ")", and for the second diff, > >> "fil" and "s-alist" should be highlighted the same as "(defvar " and > >> ")". These are not differences. >=20 > You mean you want finer granularity of fine diffs. Not at all. How do you get that from what I said? 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. In the text you quoted I spoke only of (a): return to the previous behavior of NOT showing fine diffs except for the current diff. > >> still a regression wrt prior Emacs versions. With Emacs 24.3, for > >> instance (using the same Cygwin `diff'), there is no fine diff shown > >> here. Instead, the diff, which is shown only as a main diff, is betwe= en > >> "file-local-variables-alist" and "filxxxxxxxxxxxxxxxxxxxxxs-alist". > >> Which is correct. >=20 > I don't see that here with Debian's Emacs-24.3, and neither with 23.4. It's not very clear from the above what you see and do not see, especially since you apparently did not understand the description. Do you see a bug for Emacs 24.3 or 23.4? There is none that I see - the behavior is as I described it. No fine diffs are shown for the non-current diff highlighting with Emacs 24.3 or 23.4. Are you sure you are looking at the non-current diffs (the gray ones)? That's where both bugs are: (1) wrong face (`default'), (2) incorrect fine diffing. I just repeated everything, again starting from emacs -Q with the above recipe, using 24.3. That's 5 times now I've done it (2x for 24.4, 24.3, 1x for 23.4). Same thing - just what I described originally. > The behavior you describe seems to correspond to ediff-word-mode, IIRC, > so I assume this is not really a bug/regression but just a pilot error > on your part. If not, feel free to re-open this bug report, providing > more details about the problem. I can no longer reopen bugs - Glenn apparently banned me some time ago. This has nothing to do with `ediff-word-mode' or pilot error. What I showed and described was already from emacs -Q. And S. Berman had no trouble following the recipe and confirming the behavior. But let me try again. emacs -Q Load file `cygwin-mount.el', then `setup-cygwin.el' (from Emacs Wiki). Cygwin `diff' is apparently irrelevant, but that's what I used anyway. In foo.el type some text. E.g.: (defvar advertised-signature-table) (defvar dir-local-variables-alist) (defvar dir-locals-file) (defvar file-local-variables-alist) (defvar Info-indexed-nodes) Put the same text in bar.el. Then modify it a bit in bar.el: (defvar advertiseyyyyyyyyyyyd-signature-table) (defvar dir-local-variables-alist) (defvar dir-locals-file) (defvar filxxxxxxxxxxxxxxs-alist) (defvar Info-indexed-nodes) M-x ediff-buffers ; for foo.el and bar.el Cycle among the two diffs. You will see the screenshot I sent. Now read the bug report as to what is wrong with what you see, if it is still not clear why it is a bug (2 bugs). 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). From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 02:48:22 2014 Received: (at 17388) by debbugs.gnu.org; 3 May 2014 06:48:22 +0000 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 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 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) 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) Date: Sat, 03 May 2014 09:48:27 +0300 From: Eli Zaretskii Subject: Re: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing In-reply-to: <111c9271-6a23-426e-adb2-ff5520c02806@default> X-012-Sender: halo1@inter.net.il To: Drew Adams Message-id: <83a9az1hok.fsf@gnu.org> References: <87wqe43t55.fsf@rosalinde.fritz.box> <111c9271-6a23-426e-adb2-ff5520c02806@default> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 17388 Cc: 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu, monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > 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. From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 10:01:29 2014 Received: (at 17388) by debbugs.gnu.org; 3 May 2014 14:01:29 +0000 Received: from localhost ([127.0.0.1]:49834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgaVN-00021r-86 for submit@debbugs.gnu.org; Sat, 03 May 2014 10:01:29 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:50138) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgaVL-00021c-7e for 17388@debbugs.gnu.org; Sat, 03 May 2014 10:01:27 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s43E1FwY004580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 May 2014 14:01:16 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s43E1EYG000531 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Sat, 3 May 2014 14:01:15 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s43E1DN4002144; Sat, 3 May 2014 14:01:13 GMT MIME-Version: 1.0 Message-ID: Date: Sat, 3 May 2014 07:01:13 -0700 (PDT) From: Drew Adams To: Eli Zaretskii , Drew Adams Subject: RE: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: <> <<87wqe43t55.fsf@rosalinde.fritz.box>> <> <<111c9271-6a23-426e-adb2-ff5520c02806@default>> <<83a9az1hok.fsf@gnu.org>> In-Reply-To: <<83a9az1hok.fsf@gnu.org>> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.8 (707110) [OL 12.0.6691.5000 (x86)] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 17388 Cc: 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu, monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) > > 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. >=20 > 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. OK, so you are saying that Emacs has silently changed to (b) from (a), and the way it does fine diffs corresponds to what is shown. So be it. > > > I see both of these problematic highlightings on GNU/Linux builds fro= m > > > both the trunk (bzr 117042) and the emacs-24 branch (bzr 117049). >=20 > 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. It is a change in behavior wrt older Emacsen, which do not show fine diffs within the non-current diffs. Regression or improvement - we can have different opinions. (BTW, I see nothing in NEWS about this behavior change.) But more importantly, "REGRESSION" in the subject line is for the bug report, and #1 is the more serious part: removing diff highlighting from part of a diff gives the impression that that unhighlighted text is not different. From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 11:57:33 2014 Received: (at 17388) by debbugs.gnu.org; 3 May 2014 15:57:33 +0000 Received: from localhost ([127.0.0.1]:49868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgcJg-0005NB-JD for submit@debbugs.gnu.org; Sat, 03 May 2014 11:57:32 -0400 Received: from mail-qc0-f180.google.com ([209.85.216.180]:40825) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgcJe-0005Mx-EU for 17388@debbugs.gnu.org; Sat, 03 May 2014 11:57:30 -0400 Received: by mail-qc0-f180.google.com with SMTP id i17so5344457qcy.39 for <17388@debbugs.gnu.org>; Sat, 03 May 2014 08:57:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=+YcMJpltJFcfx/SF6muFk49W3PaVlRhDP4jsduFUugQ=; b=lwTnCV7IJ5BDtKb8y+BRwlXIr4lGag0xHViDY/kSUG70p0gNF6Mu61M58A2A21vsuV A+JE8FRkilUFg5wrgtZRFO7Zm0wc6zclf5WUM3vCoT3EYU9B1QvAG5CU2cIEaQhVwNyU /vXBk0D3WWhXkibmVEut2TNvCLOCgkgVx6F5dD8ryIrQ/WtNhxfpad0VDgzVa2LtoU3Z quweVUlJXKrBaQjraqEfbCsgjB0zk1D8kQb7W3b3ctaUTcrJ+lSayLEqPLzdmrEwoBXk 6UR3dZZhf7Twsq7sJcyJAxD+7VOyzVtKg8oWBbpscFuEJsExQKQXmbWvuiiidldZf1BR c0UQ== X-Gm-Message-State: ALoCoQnEnFCB1VtHoZT8TMBFfJKS/2KQmCeSnOZYr06HKXPzdqm9C60hpt3Ztq7AW3uoGHP/WDRk X-Received: by 10.224.103.197 with SMTP id l5mr31726346qao.69.1399132644694; Sat, 03 May 2014 08:57:24 -0700 (PDT) Received: from [192.168.1.106] (ool-18bf44a9.dyn.optonline.net. [24.191.68.169]) by mx.google.com with ESMTPSA id l10sm5124266qav.13.2014.05.03.08.57.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 03 May 2014 08:57:24 -0700 (PDT) Message-ID: <536511E3.1000905@stonybrook.edu> Date: Sat, 03 May 2014 11:57:23 -0400 From: Michael Kifer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Drew Adams , Eli Zaretskii Subject: Re: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: <> <<87wqe43t55.fsf@rosalinde.fritz.box>> <> <<111c9271-6a23-426e-adb2-ff5520c02806@default>> <<83a9az1hok.fsf@gnu.org>> <8613042fc3be4f9995e33e38d4f079f0@HUBCAS1.cs.stonybrook.edu> In-Reply-To: <8613042fc3be4f9995e33e38d4f079f0@HUBCAS1.cs.stonybrook.edu> Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 17388 Cc: "17388@debbugs.gnu.org" <17388@debbugs.gnu.org>, "monnier@iro.umontreal.ca" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.4 (/)
On 05/03/2014 10:01 AM, Drew Adams wrote:
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.

OK, so you are saying that Emacs has silently changed to (b) from (a),
and the way it does fine diffs corresponds to what is shown.  So be it.

Ediff never showed fine diffs for any region but the current one.

--

       --- michael

 


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.

It is a change in behavior wrt older Emacsen, which do not show fine
diffs within the non-current diffs.  Regression or improvement - we
can have different opinions.  (BTW, I see nothing in NEWS about this
behavior change.)

But more importantly, "REGRESSION" in the subject line is for the bug
report, and #1 is the more serious part: removing diff highlighting
from part of a diff gives the impression that that unhighlighted text
is not different.

From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 12:42:22 2014 Received: (at 17388) by debbugs.gnu.org; 3 May 2014 16:42:22 +0000 Received: from localhost ([127.0.0.1]:49895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wgd14-0006Xj-8C for submit@debbugs.gnu.org; Sat, 03 May 2014 12:42:22 -0400 Received: from mtaout24.012.net.il ([80.179.55.180]:57525) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wgd10-0006XQ-Uc for 17388@debbugs.gnu.org; Sat, 03 May 2014 12:42:19 -0400 Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0N5000300B0ZCG00@mtaout24.012.net.il> for 17388@debbugs.gnu.org; Sat, 03 May 2014 19:39:51 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N5000OTSBME4K50@mtaout24.012.net.il>; Sat, 03 May 2014 19:39:51 +0300 (IDT) Date: Sat, 03 May 2014 19:42:12 +0300 From: Eli Zaretskii Subject: Re: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing In-reply-to: X-012-Sender: halo1@inter.net.il To: Drew Adams Message-id: <83y4yizue3.fsf@gnu.org> References: <87wqe43t55.fsf@rosalinde.fritz.box> <111c9271-6a23-426e-adb2-ff5520c02806@default> <83a9az1hok.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 17388 Cc: 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu, monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Sat, 3 May 2014 07:01:13 -0700 (PDT) > From: Drew Adams > Cc: monnier@iro.umontreal.ca, 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu > > > > 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. > > OK, so you are saying that Emacs has silently changed to (b) from (a), > and the way it does fine diffs corresponds to what is shown. Yes. But Stefan now changed it back. Therefore, I was talking only about the 2nd part of your report, which complains that the fine diffs are incorrect. > > > > 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. > > It is a change in behavior wrt older Emacsen, which do not show fine > diffs within the non-current diffs. Again, that part is now gone; Emacs behaves like before: it shows fine diffs only in the current hnunk. > But more importantly, "REGRESSION" in the subject line is for the bug > report, and #1 is the more serious part: removing diff highlighting > from part of a diff gives the impression that that unhighlighted text > is not different. #1 is solved; do you agree that #2 is not a bug, but the intended behavior that was always there? From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 16:42:02 2014 Received: (at 17388) by debbugs.gnu.org; 3 May 2014 20:42:02 +0000 Received: from localhost ([127.0.0.1]:49959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wggkz-0004HC-Ja for submit@debbugs.gnu.org; Sat, 03 May 2014 16:42:02 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:40684) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wggkw-0004Gx-J9 for 17388@debbugs.gnu.org; Sat, 03 May 2014 16:41:59 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s43Kfoml030315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 May 2014 20:41:51 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s43KfnQJ015049 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 3 May 2014 20:41:50 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s43Kfnax022463; Sat, 3 May 2014 20:41:49 GMT MIME-Version: 1.0 Message-ID: <9a7b1409-edbe-4633-829f-0a839d69b11a@default> Date: Sat, 3 May 2014 13:41:49 -0700 (PDT) From: Drew Adams To: Michael Kifer , Eli Zaretskii Subject: RE: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: <> <<87wqe43t55.fsf@rosalinde.fritz.box>> <> <<111c9271-6a23-426e-adb2-ff5520c02806@default>> <<83a9az1hok.fsf@gnu.org>> <8613042fc3be4f9995e33e38d4f079f0@HUBCAS1.cs.stonybrook.edu> <536511E3.1000905@stonybrook.edu> In-Reply-To: <536511E3.1000905@stonybrook.edu> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.8 (707110) [OL 12.0.6691.5000 (x86)] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 17388 Cc: 17388@debbugs.gnu.org, monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) >>>> 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. >>>=20 >>> 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. >>=20 >> OK, so you are saying that Emacs has silently changed to (b) from (a), >> and the way it does fine diffs corresponds to what is shown. So be it. >=20 > Ediff never showed fine diffs for any region but the current one.=20 Precisely. To (b) from (a). Emacs never showed fine diffs for non-current diffs before. It's OK with me if it does so now. I thought that the inaccurate fine diffs shown for this were new and particular to this non-current diff highlighting. I was corrected: apparently fine diffs are this inaccurate in general. From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 16:56:30 2014 Received: (at 17388) by debbugs.gnu.org; 3 May 2014 20:56:30 +0000 Received: from localhost ([127.0.0.1]:49999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wggyz-0004fo-PZ for submit@debbugs.gnu.org; Sat, 03 May 2014 16:56:30 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:41763) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wggyw-0004fX-N1 for 17388@debbugs.gnu.org; Sat, 03 May 2014 16:56:27 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s43KuFSP005997 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 May 2014 20:56:16 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id s43KuDSF006333 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 3 May 2014 20:56:14 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s43KuD3q004479; Sat, 3 May 2014 20:56:13 GMT MIME-Version: 1.0 Message-ID: <12ee0dda-6f13-4056-8130-79aefdd4bbbe@default> Date: Sat, 3 May 2014 13:56:13 -0700 (PDT) From: Drew Adams To: Eli Zaretskii , Drew Adams Subject: RE: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: <> <<87wqe43t55.fsf@rosalinde.fritz.box>> <> <<111c9271-6a23-426e-adb2-ff5520c02806@default>> <<83a9az1hok.fsf@gnu.org>> <> <<83y4yizue3.fsf@gnu.org>> In-Reply-To: <<83y4yizue3.fsf@gnu.org>> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.8 (707110) [OL 12.0.6691.5000 (x86)] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 17388 Cc: 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu, monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) > > > > 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. > > > > OK, so you are saying that Emacs has silently changed to (b) from (a), > > and the way it does fine diffs corresponds to what is shown. >=20 > Yes. But Stefan now changed it back. He did? I thought he fixed only #1: the use of face `default'. I didn't think that he also got rid of the new fine-diffing for non-current diffs. If he did, then both #1 and #2 should presumably be fixed. > Therefore, I was talking only about the 2nd part of your report, which > complains that the fine diffs are incorrect. If Stefan got rid of the change to fine-diffing for non-current diffs then it doesn't matter whether that fine-diffing was inaccurate. > > It is a change in behavior wrt older Emacsen, which do not show fine > > diffs within the non-current diffs. >=20 > Again, that part is now gone; Emacs behaves like before: it shows fine > diffs only in the current hnunk. OK, if you say so. Great. I didn't notice that in the patch he sent. > > But more importantly, "REGRESSION" in the subject line is for the bug > > report, and #1 is the more serious part: removing diff highlighting > > from part of a diff gives the impression that that unhighlighted text > > is not different. >=20 > #1 is solved; do you agree that #2 is not a bug, but the intended > behavior that was always there? #2 was that non-current diffs were being fine-diffed, and that fine-diffing was inaccurate. It was explained to me that fine-diffing is inaccurate in this way generally. IOW, this has nothing to do with the fact that they were now applied to non-current diffs. If fine-diffing is inaccurate in general (call it word-diffing or whatever, if that helps), then so be it. I am OK with #1 being fixed. I am OK with #2 also being reverted to not showing fine diffs for non-current. I am OK also with fine diffs being shown for non-current (given that #1 is fixed, so they are not shown with face `default'). I understand now that the inaccuracy of fine diffs that I pointed out is apparently general and not something new for only non-current fine diffing. From debbugs-submit-bounces@debbugs.gnu.org Sat May 03 23:54:11 2014 Received: (at 17388) by debbugs.gnu.org; 4 May 2014 03:54:11 +0000 Received: from localhost ([127.0.0.1]:50265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgnVC-0001Uu-IG for submit@debbugs.gnu.org; Sat, 03 May 2014 23:54:11 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:54495) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WgnVA-0001Ud-Gv for 17388@debbugs.gnu.org; Sat, 03 May 2014 23:54:09 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArYGAIDvNVNLd/4Y/2dsb2JhbABZgwaDSr0vgw6BFxd0giUBAQEBAgFWIwULCzQSFBgNJIgECNIZF456B4Q4BKkZgWqDTCE X-IPAS-Result: ArYGAIDvNVNLd/4Y/2dsb2JhbABZgwaDSr0vgw6BFxd0giUBAQEBAgFWIwULCzQSFBgNJIgECNIZF456B4Q4BKkZgWqDTCE X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="61436310" Received: from 75-119-254-24.dsl.teksavvy.com (HELO ceviche.home) ([75.119.254.24]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 03 May 2014 23:54:01 -0400 Received: by ceviche.home (Postfix, from userid 20848) id ADB2366094; Sat, 3 May 2014 23:54:01 -0400 (EDT) From: Stefan Monnier To: Drew Adams Subject: Re: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing Message-ID: References: > <87wqe43t55.fsf@rosalinde.fritz.box>> > <111c9271-6a23-426e-adb2-ff5520c02806@default>> <83a9az1hok.fsf@gnu.org>> <8613042fc3be4f9995e33e38d4f079f0@HUBCAS1.cs.stonybrook.edu> <536511E3.1000905@stonybrook.edu> <9a7b1409-edbe-4633-829f-0a839d69b11a@default> Date: Sat, 03 May 2014 23:54:01 -0400 In-Reply-To: <9a7b1409-edbe-4633-829f-0a839d69b11a@default> (Drew Adams's message of "Sat, 3 May 2014 13:41:49 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 17388 Cc: Michael Kifer , 17388@debbugs.gnu.org, Eli Zaretskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > Precisely. To (b) from (a). Emacs never showed fine diffs for > non-current diffs before. For fucking christ's sake, Drew. Can you fucking try the patch before assuming people didn't understand you and before complaining any further? Stefan From debbugs-submit-bounces@debbugs.gnu.org Sun May 04 03:16:10 2014 Received: (at 17388) by debbugs.gnu.org; 4 May 2014 07:16:10 +0000 Received: from localhost ([127.0.0.1]:50337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wgqeg-0007lO-4T for submit@debbugs.gnu.org; Sun, 04 May 2014 03:16:10 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:21083) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wgqee-0007l7-9J for 17388@debbugs.gnu.org; Sun, 04 May 2014 03:16:09 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s447G1OJ020912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 4 May 2014 07:16:02 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s447G0kv009824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 4 May 2014 07:16:00 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s447FxIY004113; Sun, 4 May 2014 07:15:59 GMT MIME-Version: 1.0 Message-ID: Date: Sun, 4 May 2014 00:16:01 -0700 (PDT) From: Drew Adams To: Stefan Monnier Subject: RE: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing References: > <87wqe43t55.fsf@rosalinde.fritz.box>> > <111c9271-6a23-426e-adb2-ff5520c02806@default>> <83a9az1hok.fsf@gnu.org>> <8613042fc3be4f9995e33e38d4f079f0@HUBCAS1.cs.stonybrook.edu> <536511E3.1000905@stonybrook.edu> <9a7b1409-edbe-4633-829f-0a839d69b11a@default> In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.8 (707110) [OL 12.0.6691.5000 (x86)] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Spam-Score: -3.0 (---) X-Debbugs-Envelope-To: 17388 Cc: Michael Kifer , 17388@debbugs.gnu.org, Eli Zaretskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.0 (---) > For fucking christ's sake, Drew. Can you fucking try the patch before > assuming people didn't understand you and before complaining any further? >=20 > Stefan No idea what that rant is all about. I was not complaining at all. Thanks for fixing the bug, and I hope you are feeling better now. From unknown Sat Aug 16 21:17:53 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 01 Jun 2014 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator