all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Juri Linkov <juri@jurta.org>
To: Dani Moncayo <dmoncayo@gmail.com>
Cc: 10181@debbugs.gnu.org
Subject: bug#10181: split `diff-refine-change' in several faces
Date: Sat, 14 Jun 2014 16:12:12 +0300	[thread overview]
Message-ID: <87vbs3y6s3.fsf@mail.jurta.org> (raw)
In-Reply-To: <87y4wz1wjq.fsf@mail.jurta.org> (Juri Linkov's message of "Sat, 14 Jun 2014 15:54:17 +0300")

> 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")





  reply	other threads:[~2014-06-14 13:12 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-01 15:56 bug#10181: 24.0.92; [wishlist] split `diff-refine-change' in several faces Dani Moncayo
2011-12-02 10:47 ` Juri Linkov
2012-05-17  0:33 ` Juri Linkov
2012-05-17  1:37   ` Stefan Monnier
2012-05-18  0:32     ` Juri Linkov
2012-05-18 18:12       ` Stefan Monnier
2012-05-18 23:07         ` Juri Linkov
2012-05-19 18:24           ` Stefan Monnier
2012-05-19 23:55             ` Juri Linkov
2012-05-20 15:06               ` Stefan Monnier
2012-05-21  0:28                 ` Juri Linkov
2012-05-21  1:45                   ` Stefan Monnier
2012-05-23  0:36                     ` Juri Linkov
2012-05-23 13:53                       ` Stefan Monnier
2012-05-25  0:57                         ` Juri Linkov
2012-05-25 13:21                           ` Stefan Monnier
2012-05-25 20:35                             ` Juri Linkov
2012-05-26 13:13                               ` Stefan Monnier
2012-05-27  9:46                                 ` Juri Linkov
     [not found] ` <handler.10181.D10181.133811261729958.notifdone@debbugs.gnu.org>
2012-09-30 16:38   ` Juri Linkov
2014-06-14 11:58 ` bug#10181: " Dani Moncayo
2014-06-14 12:54   ` Juri Linkov
2014-06-14 13:12     ` Juri Linkov [this message]
2014-06-16  6:55       ` Juri Linkov
2014-06-18  8:57         ` Juri Linkov
2014-06-18  9:14           ` Dani Moncayo
2014-06-19  6:54             ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87vbs3y6s3.fsf@mail.jurta.org \
    --to=juri@jurta.org \
    --cc=10181@debbugs.gnu.org \
    --cc=dmoncayo@gmail.com \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.