From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#10181: split `diff-refine-change' in several faces Date: Sat, 14 Jun 2014 16:12:12 +0300 Organization: JURTA Message-ID: <87vbs3y6s3.fsf@mail.jurta.org> References: <87y4wz1wjq.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1402751729 9784 80.91.229.3 (14 Jun 2014 13:15:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Jun 2014 13:15:29 +0000 (UTC) Cc: 10181@debbugs.gnu.org To: Dani Moncayo Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 14 15:15:22 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 1Wvnnk-0006nT-QM for geb-bug-gnu-emacs@m.gmane.org; Sat, 14 Jun 2014 15:15:20 +0200 Original-Received: from localhost ([::1]:35406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wvnnk-0006Y4-8C for geb-bug-gnu-emacs@m.gmane.org; Sat, 14 Jun 2014 09:15:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wvnna-0006X6-6X for bug-gnu-emacs@gnu.org; Sat, 14 Jun 2014 09:15:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvnnS-000719-Nb for bug-gnu-emacs@gnu.org; Sat, 14 Jun 2014 09:15:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvnnS-00070w-K4 for bug-gnu-emacs@gnu.org; Sat, 14 Jun 2014 09:15:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WvnnS-0006XZ-AZ for bug-gnu-emacs@gnu.org; Sat, 14 Jun 2014 09:15:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 Jun 2014 13:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10181 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10181-submit@debbugs.gnu.org id=B10181.140275168225084 (code B ref 10181); Sat, 14 Jun 2014 13:15:02 +0000 Original-Received: (at 10181) by debbugs.gnu.org; 14 Jun 2014 13:14:42 +0000 Original-Received: from localhost ([127.0.0.1]:47273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wvnn7-0006WV-Va for submit@debbugs.gnu.org; Sat, 14 Jun 2014 09:14:42 -0400 Original-Received: from alc-vshost7.dreamhost.com ([69.163.216.107]:44186 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wvnn5-0006WN-6r for 10181@debbugs.gnu.org; Sat, 14 Jun 2014 09:14:39 -0400 Original-Received: from localhost.jurta.org (ps18281.dreamhostps.com [69.163.222.226]) by ps18281.dreamhostps.com (Postfix) with ESMTP id ABEE930324C2C6; Sat, 14 Jun 2014 06:14:37 -0700 (PDT) In-Reply-To: <87y4wz1wjq.fsf@mail.jurta.org> (Juri Linkov's message of "Sat, 14 Jun 2014 15:54:17 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) 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:90378 Archived-At: > Since they were introduced long ago, I guess this change is for the trunk: BTW, I don't remember what was the reason of defining a special terminal version of the face `diff-changed' inconsistently with the default min-colors 88 version, but it seems this is not necessary anymore because in both tty and graphical versions the differences are highlighted with distinct faces anyway. Then its definition will be the same '((t nil)) as already used by `smerge-refined-changed'. Also this means that we don't need to use `shadow' on context lines anymore, because the differing lines are always highlighted by default. === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/diff-mode.el 2014-06-14 13:05:29 +0000 @@ -302,13 +302,7 @@ (define-obsolete-face-alias 'diff-added- (defvar diff-added-face 'diff-added) (defface diff-changed - ;; We normally apply a `shadow'-based face on the `diff-context' - ;; face, and keep `diff-changed' the default. - '((((class color grayscale) (min-colors 88))) - ;; If the terminal lacks sufficient colors for shadowing, - ;; highlight changed lines explicitly. - (((class color)) - :foreground "yellow")) + '((t nil)) "`diff-mode' face used to highlight changed lines." :group 'diff-mode) (define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1") @@ -343,7 +337,7 @@ (define-obsolete-face-alias 'diff-functi (defvar diff-function-face 'diff-function) (defface diff-context - '((((class color grayscale) (min-colors 88)) :inherit shadow)) + '((t nil)) "`diff-mode' face used to highlight context and other side-information." :group 'diff-mode) (define-obsolete-face-alias 'diff-context-face 'diff-context "22.1")