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 15:54:17 +0300 [thread overview]
Message-ID: <87y4wz1wjq.fsf@mail.jurta.org> (raw)
In-Reply-To: <CAH8Pv0g0oSEsvGvr=R9L7Em5xVqC7QCgrPqqKDcEsBXJQfuO2A@mail.gmail.com> (Dani Moncayo's message of "Sat, 14 Jun 2014 13:58:00 +0200")
> In this bug report, I requested to replace the face
> 'diff-refine-change' with three different faces, related to the faces
> 'diff-added', 'diff-removed' and 'diff-changed'.
>
> That was implemented time ago (thanks Juri!), but I've just realized a
> little inconsistency in the name of one of the new faces. The new
> faces were:
> * 'diff-refine-added', related to 'diff-added'.
> * 'diff-refine-removed', related to 'diff-removed'.
> * 'diff-refine-change', related to 'diff-changed'.
>
> So, I think that 'diff-refine-change' should be named
> 'diff-refine-changed' instead, for consistency.
There are more faces that use the suffix `-changed', namely
`diff-indicator-changed' that confirms your request to rename
`diff-refine-change' to `diff-refine-changed'. OTOH, there are
more faces that use the suffix `-change', namely `smerge-refined-change'
that could be renamed to `smerge-refined-changed' for consistency with
the basic face `diff-changed', and other suffixes `-added' and `-removed'.
Since they were introduced long ago, I guess this change is for the trunk:
=== 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 12:50:02 +0000
@@ -1916,7 +1915,7 @@ (defun diff-ignore-whitespace-hunk ()
;;; Fine change highlighting.
-(defface diff-refine-change
+(defface diff-refine-changed
'((((class color) (min-colors 88) (background light))
:background "#ffff55")
(((class color) (min-colors 88) (background dark))
@@ -1924,6 +1923,7 @@ (defface diff-refine-change
(t :inverse-video t))
"Face used for char-based changes shown by `diff-refine-hunk'."
:group 'diff-mode)
+(define-obsolete-face-alias 'diff-refine-change 'diff-refine-changed "24.5")
(defface diff-refine-removed
'((default
=== modified file 'lisp/vc/smerge-mode.el'
--- lisp/vc/smerge-mode.el 2014-01-01 07:43:34 +0000
+++ lisp/vc/smerge-mode.el 2014-06-14 12:50:05 +0000
@@ -116,9 +116,10 @@ (defface smerge-markers
(define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1")
(defvar smerge-markers-face 'smerge-markers)
-(defface smerge-refined-change
+(defface smerge-refined-changed
'((t nil))
"Face used for char-based changes shown by `smerge-refine'.")
+(define-obsolete-face-alias 'smerge-refined-change 'smerge-refined-changed "24.5")
(defface smerge-refined-removed
'((default
next prev parent reply other threads:[~2014-06-14 12:54 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 [this message]
2014-06-14 13:12 ` Juri Linkov
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=87y4wz1wjq.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.