From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing Date: Fri, 02 May 2014 22:27:53 -0400 Message-ID: References: <87wqe43t55.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1399084167 16855 80.91.229.3 (3 May 2014 02:29:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 3 May 2014 02:29:27 +0000 (UTC) Cc: 17388-done@debbugs.gnu.org, Michael Kifer To: Drew Adams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 03 04:29:19 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 1WgPhX-0002eH-2f for geb-bug-gnu-emacs@m.gmane.org; Sat, 03 May 2014 04:29:19 +0200 Original-Received: from localhost ([::1]:47068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgPhW-0004Lf-ER for geb-bug-gnu-emacs@m.gmane.org; Fri, 02 May 2014 22:29:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgPhN-0004Je-74 for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 22:29:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgPhH-00077v-8p for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 22:29:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgPhH-00077l-5k for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 22:29:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WgPhG-0005jb-RG for bug-gnu-emacs@gnu.org; Fri, 02 May 2014 22:29:02 -0400 Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 May 2014 02:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 17388 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 17388@debbugs.gnu.org, monnier@iro.umontreal.ca, drew.adams@oracle.com Original-Received: via spool by 17388-done@debbugs.gnu.org id=D17388.139908408521942 (code D ref 17388); Sat, 03 May 2014 02:29:02 +0000 Original-Received: (at 17388-done) by debbugs.gnu.org; 3 May 2014 02:28:05 +0000 Original-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 Original-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" Original-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 Original-Received: by pastel.home (Postfix, from userid 20848) id C32436004E; Fri, 2 May 2014 22:27:53 -0400 (EDT) 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) 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:88565 Archived-At: >> 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)