From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#19451: compare-windows faces Date: Sat, 27 Dec 2014 03:14:35 +0200 Organization: LINKOV.NET Message-ID: <87bnmpj2v8.fsf@mail.linkov.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1419643937 24635 80.91.229.3 (27 Dec 2014 01:32:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 27 Dec 2014 01:32:17 +0000 (UTC) To: 19451@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Dec 27 02:32:10 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Y4gEk-0005s2-9Y for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Dec 2014 02:32:10 +0100 Original-Received: from localhost ([::1]:54834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4gEj-0001DO-JY for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Dec 2014 20:32:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4gEg-0001D7-5k for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:32:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4gEc-0001An-Vi for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:32:06 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4gEc-0001Aj-Sz for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:32:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y4gEc-00071Z-K6 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 01:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19451 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141964391026957 (code B ref -1); Sat, 27 Dec 2014 01:32:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Dec 2014 01:31:50 +0000 Original-Received: from localhost ([127.0.0.1]:58515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4gEP-00070g-KV for submit@debbugs.gnu.org; Fri, 26 Dec 2014 20:31:50 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:55628) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4gEN-00070J-1T for submit@debbugs.gnu.org; Fri, 26 Dec 2014 20:31:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4gEM-00019d-0j for submit@debbugs.gnu.org; Fri, 26 Dec 2014 20:31:46 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:56081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4gEL-00019Z-UI for submit@debbugs.gnu.org; Fri, 26 Dec 2014 20:31:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4gEL-0001BS-17 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:31:45 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4gEH-00019B-T3 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:31:44 -0500 Original-Received: from ps18281.dreamhost.com ([69.163.222.226]:39250 helo=ps18281.dreamhostps.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4gEH-000197-N7 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 20:31:41 -0500 Original-Received: from localhost.linkov.net (ps18281.dreamhostps.com [69.163.222.226]) by ps18281.dreamhostps.com (Postfix) with ESMTP id DCBF2305C15B4A for ; Fri, 26 Dec 2014 17:31:39 -0800 (PST) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:97751 Archived-At: 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))