From unknown Sun Jun 22 22:43:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19451: compare-windows faces 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: To: 19451@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141964391026957 (code B ref -1); Sat, 27 Dec 2014 01:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2014 01:31:50 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 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 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 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 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 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) From: Juri Linkov Organization: LINKOV.NET Date: Sat, 27 Dec 2014 03:14:35 +0200 Message-ID: <87bnmpj2v8.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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)) From unknown Sun Jun 22 22:43:33 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19451: compare-windows faces Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 15:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19451 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juri Linkov Cc: 19451@debbugs.gnu.org Received: via spool by 19451-submit@debbugs.gnu.org id=B19451.141969354226726 (code B ref 19451); Sat, 27 Dec 2014 15:20:01 +0000 Received: (at 19451) by debbugs.gnu.org; 27 Dec 2014 15:19:02 +0000 Received: from localhost ([127.0.0.1]:59198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4t8w-0006x0-96 for submit@debbugs.gnu.org; Sat, 27 Dec 2014 10:19:02 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:32984) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4t8u-0006wb-VG for 19451@debbugs.gnu.org; Sat, 27 Dec 2014 10:19:01 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Aj8PAOwQflTO+ILA/2dsb2JhbABbgweDYIVaxRsCBAICgSQXAQEBAQEBfIQDAQEDAVYjBQsLNBIUGA0kiEoJ1lkBAQEBAQUBAQEBAR2QbweESAWLAaQugXiEGSGCdwEBAQ X-IPAS-Result: Aj8PAOwQflTO+ILA/2dsb2JhbABbgweDYIVaxRsCBAICgSQXAQEBAQEBfIQDAQEDAVYjBQsLNBIUGA0kiEoJ1lkBAQEBAQUBAQEBAR2QbweESAWLAaQugXiEGSGCdwEBAQ X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="103638568" Received: from 206-248-130-192.dsl.teksavvy.com (HELO pastel.home) ([206.248.130.192]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Dec 2014 10:19:00 -0500 Received: by pastel.home (Postfix, from userid 20848) id 57492106D; Sat, 27 Dec 2014 10:19:00 -0500 (EST) From: Stefan Monnier Message-ID: References: <87bnmpj2v8.fsf@mail.linkov.net> Date: Sat, 27 Dec 2014 10:19:00 -0500 In-Reply-To: <87bnmpj2v8.fsf@mail.linkov.net> (Juri Linkov's message of "Sat, 27 Dec 2014 03:14:35 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > 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 From unknown Sun Jun 22 22:43:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Juri Linkov Subject: bug#19451: closed (Re: bug#19451: compare-windows faces) Message-ID: References: <87zja8sipb.fsf@mail.linkov.net> <87bnmpj2v8.fsf@mail.linkov.net> X-Gnu-PR-Message: they-closed 19451 X-Gnu-PR-Package: emacs Reply-To: 19451@debbugs.gnu.org Date: Sun, 28 Dec 2014 00:49:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1419727743-15443-1" This is a multi-part message in MIME format... ------------=_1419727743-15443-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #19451: compare-windows faces which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 19451@debbugs.gnu.org. --=20 19451: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D19451 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1419727743-15443-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 19451-done) by debbugs.gnu.org; 28 Dec 2014 00:48:48 +0000 Received: from localhost ([127.0.0.1]:59289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y522K-00040g-7x for submit@debbugs.gnu.org; Sat, 27 Dec 2014 19:48:48 -0500 Received: from ps18281.dreamhost.com ([69.163.222.226]:43309 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y522I-00040Y-HL for 19451-done@debbugs.gnu.org; Sat, 27 Dec 2014 19:48:47 -0500 Received: from localhost.linkov.net (ps18281.dreamhostps.com [69.163.222.226]) by ps18281.dreamhostps.com (Postfix) with ESMTP id DB8AF313159634; Sat, 27 Dec 2014 16:48:44 -0800 (PST) From: Juri Linkov To: Stefan Monnier Subject: Re: bug#19451: compare-windows faces Organization: LINKOV.NET References: <87bnmpj2v8.fsf@mail.linkov.net> Date: Sun, 28 Dec 2014 02:48:16 +0200 In-Reply-To: (Stefan Monnier's message of "Sat, 27 Dec 2014 10:19:00 -0500") Message-ID: <87zja8sipb.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 19451-done Cc: 19451-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) >> 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. ------------=_1419727743-15443-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Dec 2014 01:31:50 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 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 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 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 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 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) From: Juri Linkov To: bug-gnu-emacs@gnu.org Subject: compare-windows faces Organization: LINKOV.NET Date: Sat, 27 Dec 2014 03:14:35 +0200 Message-ID: <87bnmpj2v8.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) 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)) ------------=_1419727743-15443-1--