From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#26969: 26.0.50; diff-changed invisible by default Date: Wed, 17 May 2017 15:12:50 -0400 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1495048455 8756 195.159.176.226 (17 May 2017 19:14:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 17 May 2017 19:14:15 +0000 (UTC) Cc: Justin Burkett To: 26969@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 17 21:14:10 2017 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 1dB4Oe-00027v-PJ for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 May 2017 21:14:08 +0200 Original-Received: from localhost ([::1]:50444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB4Ok-0002IL-Da for geb-bug-gnu-emacs@m.gmane.org; Wed, 17 May 2017 15:14:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB4Oe-0002IG-72 for bug-gnu-emacs@gnu.org; Wed, 17 May 2017 15:14:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dB4OZ-0000fL-8i for bug-gnu-emacs@gnu.org; Wed, 17 May 2017 15:14:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dB4OZ-0000fH-4y for bug-gnu-emacs@gnu.org; Wed, 17 May 2017 15:14:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dB4OY-00053w-M5; Wed, 17 May 2017 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: justin@burkett.cc, bug-gnu-emacs@gnu.org Resent-Date: Wed, 17 May 2017 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26969 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Justin Burkett Original-Received: via spool by submit@debbugs.gnu.org id=B.149504838819391 (code B ref -1); Wed, 17 May 2017 19:14:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 17 May 2017 19:13:08 +0000 Original-Received: from localhost ([127.0.0.1]:51298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB4Ng-00052g-5f for submit@debbugs.gnu.org; Wed, 17 May 2017 15:13:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dB4Nd-000521-8O for submit@debbugs.gnu.org; Wed, 17 May 2017 15:13:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dB4NX-0000Hy-8F for submit@debbugs.gnu.org; Wed, 17 May 2017 15:13:00 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:45266) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dB4NX-0000Hu-55 for submit@debbugs.gnu.org; Wed, 17 May 2017 15:12:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB4NW-0002B6-4b for bug-gnu-emacs@gnu.org; Wed, 17 May 2017 15:12:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dB4NR-0000H6-6r for bug-gnu-emacs@gnu.org; Wed, 17 May 2017 15:12:58 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:59154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dB4NR-0000Gt-13 for bug-gnu-emacs@gnu.org; Wed, 17 May 2017 15:12:53 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id v4HJCoIT014720 for ; Wed, 17 May 2017 15:12:50 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 189A266242; Wed, 17 May 2017 15:12:50 -0400 (EDT) X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.3 X-NAI-Spam-Rules: 5 Rules triggered BEC_TRC1=0.1, BEC_TRC1_W_GEN_SPAM_FEATRE=0.1, GEN_SPAM_FEATRE=0.1, EDT_SA_DN_PASS=0, RV6027=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6027> : inlines <5878> : streams <1745925> : uri <2428305> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:132576 Archived-At: Package: Emacs Version: 26.0.50 Nowadays the `diff-changed` face is defined to be "invisible" (i.e. the text is displayed identically with or without that face). IOW it can only be used as a parent of diff-added or diff-removed (or some other such face). This is a bad idea since in cases such as vdiff.el where some changes are neither additions nor removals, it would make sense to highlight the buffer as just "changed" and using that face is a natural choice. I suggest the patch below for that. It is designed such that it should make no visible difference to users of diff-added and diff-removed since these faces override the parts that are set by my patch in diff-changed. Another option would be to introduce a new face (not sure how to call it, maybe diff-unspecified-change, maybe?) which inherits from diff-changed as well. Stefan diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index aa8d77882e..1aa6c05662 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -290,9 +290,14 @@ diff-added :group 'diff-mode) (defface diff-changed - '((t nil)) + '((((class color) (min-colors 88) (background light)) + :background "grey90") + (((class color) (min-colors 88) (background dark)) + :background "grey20") + (((class color)) + :foreground "grey")) "`diff-mode' face used to highlight changed lines." - :version "25.1" + :version "26.1" :group 'diff-mode) (defface diff-indicator-removed