From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#33567: Syntactic fontification of diff hunks Date: Fri, 21 Dec 2018 00:00:18 +0200 Organization: LINKOV.NET Message-ID: <8736qrkgel.fsf@mail.linkov.net> References: <878t18j4is.fsf@mail.linkov.net> <87a7lnv6ex.fsf@mail.linkov.net> <83pnuj9kb8.fsf@gnu.org> <875zwajh6c.fsf@mail.linkov.net> <837egpagko.fsf@gnu.org> <87k1koygvm.fsf@mail.linkov.net> <83r2ew8mfx.fsf@gnu.org> <87va475y1m.fsf@mail.linkov.net> <87mupafi73.fsf@mail.linkov.net> <834lbgh3n7.fsf@gnu.org> <87h8fduis0.fsf@mail.linkov.net> <83d0q0dtc0.fsf@gnu.org> <877eg7sq8a.fsf@mail.linkov.net> <47546098-59ef-ae43-878a-fd225b60ec99@yandex.ru> <874lba1n0n.fsf@mail.linkov.net> <87d0pyxtnc.fsf@mail.linkov.net> <532bc1dc-1b44-dc3a-23f0-f96e6d586123@yandex.ru> <09b2c002-1519-61dd-6e8b-2e87794077e2@yandex.ru> <87zht1jjdf.fsf@mail.linkov.net> <75267609-e167-c26e-82e8-d6c2609dbf30@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1545345012 13700 195.159.176.226 (20 Dec 2018 22:30:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 20 Dec 2018 22:30:12 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: 33567@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 20 23:30:08 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga6pT-0003S0-G3 for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Dec 2018 23:30:07 +0100 Original-Received: from localhost ([::1]:41132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga6rZ-0007qw-OS for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Dec 2018 17:32:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga6rP-0007qM-FM for bug-gnu-emacs@gnu.org; Thu, 20 Dec 2018 17:32:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga6rM-0005ui-74 for bug-gnu-emacs@gnu.org; Thu, 20 Dec 2018 17:32:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:52603) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ga6rK-0005sI-HD for bug-gnu-emacs@gnu.org; Thu, 20 Dec 2018 17:32:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ga6rK-0006aq-DR for bug-gnu-emacs@gnu.org; Thu, 20 Dec 2018 17:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 20 Dec 2018 22:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33567 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 33567-submit@debbugs.gnu.org id=B33567.154534509725291 (code B ref 33567); Thu, 20 Dec 2018 22:32:02 +0000 Original-Received: (at 33567) by debbugs.gnu.org; 20 Dec 2018 22:31:37 +0000 Original-Received: from localhost ([127.0.0.1]:56857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga6qv-0006Zr-1d for submit@debbugs.gnu.org; Thu, 20 Dec 2018 17:31:37 -0500 Original-Received: from common.maple.relay.mailchannels.net ([23.83.214.38]:35940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga6qr-0006Zi-W5 for 33567@debbugs.gnu.org; Thu, 20 Dec 2018 17:31:34 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B2A0F683F16; Thu, 20 Dec 2018 22:31:32 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a6.g.dreamhost.com (unknown [100.96.26.166]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 6B796680E27; Thu, 20 Dec 2018 22:31:32 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a6.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Thu, 20 Dec 2018 22:31:32 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Shade-Inform: 6af369662a760aaa_1545345092583_2002997700 X-MC-Loop-Signature: 1545345092583:390174868 X-MC-Ingress-Time: 1545345092583 Original-Received: from pdx1-sub0-mail-a6.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a6.g.dreamhost.com (Postfix) with ESMTP id 1D0698084E; Thu, 20 Dec 2018 14:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=bL/3Gdn1lQYaoDmuTZsUDbYg3OQ=; b= jjo+81waDhkpMfNdb88RJIrWWqirKv8OB9kXJT+v+RxJNDwC5nFYwcXcZXAAQ73b ia3xnriZciP9hGrIniGZHhD4UnFp7WBQ5aPPuLubv+FhjD8Vx9sEXbmTiDKXh1th KpwbVWESBXKGWnATT9Y3TLSiBDmQ7tcZSppubVFRrQM= Original-Received: from mail.jurta.org (m91-129-106-79.cust.tele2.ee [91.129.106.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a6.g.dreamhost.com (Postfix) with ESMTPSA id 9317180851; Thu, 20 Dec 2018 14:31:29 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a6 In-Reply-To: <75267609-e167-c26e-82e8-d6c2609dbf30@yandex.ru> (Dmitry Gutov's message of "Thu, 20 Dec 2018 00:50:15 +0200") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedrudejfedgudeifecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuohhfffgjkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecukfhppeeluddruddvledruddtiedrjeelnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledruddtiedrjeelpdhrvghtuhhrnhdqphgrthhhpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhhrtghpthhtohepughguhhtohhvseihrghnuggvgidrrhhunecuvehluhhsthgvrhfuihiivgepud X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:153656 Archived-At: >>> Anyway, to be clear, and other considerations aside, this works: >>> [...] >>> (defface diff-added >>> @@ -315,9 +313,7 @@ diff-added >>> (((class color) (min-colors 88) (background light)) >>> :background "#ddffdd") >>> (((class color) (min-colors 88) (background dark)) >>> - :background "#335533") >>> - (((class color)) >>> - :foreground "green")) >>> + :background "#335533")) >>> "`diff-mode' face used to highlight added lines.") >>> [...] >>> (defface diff-indicator-added >>> '((default :inherit diff-added) >>> (((class color) (min-colors 88)) >>> - :foreground "#22aa22")) >>> + :foreground "#22aa22") >>> + (((class color)) >>> + :foreground "green")) >>> "`diff-mode' face used to highlight indicator of added lines (+, >)." >>> :version "22.1") >>> (defvar diff-indicator-added-face 'diff-indicator-added) >> >> This looks good. > > Should I install it? Nobody has commented on my earlier stated concerns, > but maybe we should just push it and see how it plays out. I don't know. We have two options for tty: highlight indicators only or use red/green foreground without syntax highlighting. >> For the same reason we have the face font-lock-comment-delimiter-face >> separate from font-lock-comment-face to use colors only on the former, >> but not on the latter on tty with 8 colors to make easier to read comments. > > Yeah, it's totally fine to use separate faces. And I was happy to see > diff-indicator-* were already defined and in use. > > My concerns were different, though: > > 1. Is it okay to use the black foreground inside diff hunks even when > diff-font-lock-syntax is nil? It's an incompatible change. By default it used the black foreground. Only Magit uses red/green foreground. > 2. Even if we change the default in diff-added and diff-removed, some > themes might have their foregrounds customized, so those users won't notice > the change. It will trickle down to the themes eventually, I think, but > it's unclear how the theme authors will choose to deal with this change > while keeping compatibility with previous Emacs releases. Maybe with conditional face definitions like (if (boundp 'diff-font-lock-syntax) (defface blabla))