From: Dmitry Gutov <dgutov@yandex.ru>
To: Juri Linkov <juri@linkov.net>
Cc: 33567@debbugs.gnu.org
Subject: bug#33567: Syntactic fontification of diff hunks
Date: Wed, 19 Dec 2018 03:35:39 +0200 [thread overview]
Message-ID: <09b2c002-1519-61dd-6e8b-2e87794077e2@yandex.ru> (raw)
In-Reply-To: <532bc1dc-1b44-dc3a-23f0-f96e6d586123@yandex.ru>
On 19.12.2018 2:48, Dmitry Gutov wrote:
> On 19.12.2018 2:11, Juri Linkov wrote:
>
>> Does it help to remove foreground colors from diff-added and
>> diff-removed?
>
> Yup. Except if I customize those and restart, I think the +'s and -'s on
> the left will become black as well, which is somewhat of a loss.
(Maybe not on colorful enough displays, though).
Anyway, to be clear, and other considerations aside, this works:
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index ed953deb21..8a41e365da 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -304,9 +304,7 @@ diff-removed
(((class color) (min-colors 88) (background light))
:background "#ffdddd")
(((class color) (min-colors 88) (background dark))
- :background "#553333")
- (((class color))
- :foreground "red"))
+ :background "#553333"))
"`diff-mode' face used to highlight removed lines.")
(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-changed
@@ -328,7 +324,9 @@ diff-changed
(defface diff-indicator-removed
'((default :inherit diff-removed)
(((class color) (min-colors 88))
- :foreground "#aa2222"))
+ :foreground "#aa2222")
+ (((class color))
+ :foreground "red"))
"`diff-mode' face used to highlight indicator of removed lines (-, <)."
:version "22.1")
(defvar diff-indicator-removed-face 'diff-indicator-removed)
@@ -336,7 +334,9 @@ diff-indicator-removed-face
(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)
next prev parent reply other threads:[~2018-12-19 1:35 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-01 21:55 bug#33567: Syntactic fontification of diff hunks Juri Linkov
2018-12-02 6:56 ` Eli Zaretskii
2018-12-03 0:34 ` Juri Linkov
2018-12-03 6:49 ` Eli Zaretskii
2018-12-03 23:36 ` Juri Linkov
2018-12-04 7:01 ` Eli Zaretskii
2018-12-04 23:16 ` Juri Linkov
2018-12-05 7:19 ` Eli Zaretskii
2018-12-05 23:25 ` Juri Linkov
2018-12-06 6:53 ` Eli Zaretskii
2018-12-11 0:38 ` Juri Linkov
2018-12-11 6:23 ` Eli Zaretskii
2018-12-12 0:28 ` Juri Linkov
2018-12-12 17:11 ` Eli Zaretskii
2018-12-03 23:59 ` Juri Linkov
2018-12-04 7:36 ` Eli Zaretskii
2018-12-04 23:28 ` Juri Linkov
2018-12-05 7:25 ` Eli Zaretskii
2018-12-05 23:35 ` Juri Linkov
2018-12-12 23:17 ` Juri Linkov
2018-12-14 9:13 ` Eli Zaretskii
2018-12-16 23:27 ` Juri Linkov
2018-12-17 16:13 ` Eli Zaretskii
2018-12-17 23:11 ` Juri Linkov
2018-12-18 0:14 ` Juri Linkov
2018-12-18 15:55 ` Dmitry Gutov
2018-12-18 22:35 ` Juri Linkov
2018-12-18 23:33 ` Dmitry Gutov
2018-12-19 0:11 ` Juri Linkov
2018-12-19 0:48 ` Dmitry Gutov
2018-12-19 1:35 ` Dmitry Gutov [this message]
2018-12-19 21:49 ` Juri Linkov
2018-12-19 22:50 ` Dmitry Gutov
2018-12-20 22:00 ` Juri Linkov
2018-12-24 2:29 ` Dmitry Gutov
2018-12-25 20:35 ` Juri Linkov
2018-12-25 21:15 ` Dmitry Gutov
2018-12-26 22:49 ` Juri Linkov
2018-12-26 23:16 ` Dmitry Gutov
2018-12-27 0:18 ` Juri Linkov
2018-12-27 0:45 ` Dmitry Gutov
2018-12-27 3:34 ` Eli Zaretskii
2018-12-27 3:32 ` Eli Zaretskii
2018-12-19 21:51 ` Juri Linkov
2018-12-20 0:11 ` Dmitry Gutov
2018-12-20 21:50 ` Juri Linkov
2018-12-20 1:15 ` Dmitry Gutov
2018-12-20 22:17 ` Juri Linkov
2018-12-25 20:39 ` Juri Linkov
2018-12-26 1:40 ` Dmitry Gutov
2018-12-26 22:59 ` Juri Linkov
2018-12-26 23:56 ` Dmitry Gutov
2018-12-27 20:39 ` Juri Linkov
2018-12-29 23:07 ` Juri Linkov
2018-12-30 23:07 ` Dmitry Gutov
2018-12-26 0:43 ` Dmitry Gutov
2018-12-03 11:24 ` Dmitry Gutov
2018-12-03 23:24 ` Juri Linkov
2018-12-04 0:20 ` Dmitry Gutov
2018-12-04 6:46 ` Eli Zaretskii
2018-12-04 22:58 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=09b2c002-1519-61dd-6e8b-2e87794077e2@yandex.ru \
--to=dgutov@yandex.ru \
--cc=33567@debbugs.gnu.org \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).