GNU bug report logs - #10181
24.0.92; [wishlist] split `diff-refine-change' in several faces

Previous Next

Full log

Message #78 received at 10181 <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> jurta.org>
To: Dani Moncayo <dmoncayo <at> gmail.com>
Cc: 10181 <at> debbugs.gnu.org
Subject: Re: bug#10181: split `diff-refine-change' in several faces
Date: Sat, 14 Jun 2014 15:54:17 +0300

> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.