GNU bug report logs - #19451
compare-windows faces

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 19451 in the body.
You can then email your comments to 19451 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Juri Linkov <juri <at> linkov.net>
To: bug-gnu-emacs <at> gnu.org
Subject: compare-windows faces
Date: Sat, 27 Dec 2014 03:14:35 +0200

Since compare-windows is closely related to diff-mode and ediff
it would make sense to use diff faces in compare-windows:

diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 3b8293c..a8c68e6 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -128,11 +128,19 @@ (defcustom compare-windows-highlight t
   :group 'compare-windows
   :version "22.1")
 
-(defface compare-windows
-  '((t :inherit lazy-highlight))
-  "Face for highlighting of compare-windows difference regions."
+(defface compare-windows-removed
+  '((t :inherit diff-removed))
+  "Face for highlighting of compare-windows removed regions."
   :group 'compare-windows
-  :version "22.1")
+  :version "25.1")
+
+(defface compare-windows-added
+  '((t :inherit diff-added))
+  "Face for highlighting of compare-windows added regions."
+  :group 'compare-windows
+  :version "25.1")
+
+(define-obsolete-face-alias 'compare-windows 'compare-windows-added "25.1")
 
 (defvar compare-windows-overlay1 nil)
 (defvar compare-windows-overlay2 nil)
@@ -393,13 +401,13 @@ (defun compare-windows-highlight (beg1 end1 b1 w1 beg2 end2 b2 w2)
     (if compare-windows-overlay1
         (move-overlay compare-windows-overlay1 beg1 end1 b1)
       (setq compare-windows-overlay1 (make-overlay beg1 end1 b1))
-      (overlay-put compare-windows-overlay1 'face 'compare-windows)
+      (overlay-put compare-windows-overlay1 'face 'compare-windows-added)
       (overlay-put compare-windows-overlay1 'priority 1000))
     (overlay-put compare-windows-overlay1 'window w1)
     (if compare-windows-overlay2
         (move-overlay compare-windows-overlay2 beg2 end2 b2)
       (setq compare-windows-overlay2 (make-overlay beg2 end2 b2))
-      (overlay-put compare-windows-overlay2 'face 'compare-windows)
+      (overlay-put compare-windows-overlay2 'face 'compare-windows-removed)
       (overlay-put compare-windows-overlay2 'priority 1000))
     (overlay-put compare-windows-overlay2 'window w2)
     (if (not (eq compare-windows-highlight 'persistent))

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

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Juri Linkov <juri <at> linkov.net>
Cc: 19451 <at> debbugs.gnu.org
Subject: Re: bug#19451: compare-windows faces
Date: Sat, 27 Dec 2014 10:19:00 -0500

> Since compare-windows is closely related to diff-mode and ediff
> it would make sense to use diff faces in compare-windows:

Sounds good.  But don't you need a (require 'diff-mode) to make sure
those faces are actually defined?


        Stefan

Message #13 received at 19451-done <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 19451-done <at> debbugs.gnu.org
Subject: Re: bug#19451: compare-windows faces
Date: Sun, 28 Dec 2014 02:48:16 +0200

>> Since compare-windows is closely related to diff-mode and ediff
>> it would make sense to use diff faces in compare-windows:
>
> Sounds good.  But don't you need a (require 'diff-mode) to make sure
> those faces are actually defined?

A require is definitely required, so I installed with it.

Previous Next

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