From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#10181: 24.0.92; [wishlist] split `diff-refine-change' in several faces Date: Sun, 20 May 2012 21:45:54 -0400 Message-ID: References: <87txzftzn0.fsf@mail.jurta.org> <87396yxr9u.fsf@mail.jurta.org> <87d361w2ea.fsf@mail.jurta.org> <87aa13k9o1.fsf@mail.jurta.org> <87k406uz7n.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1337564801 6387 80.91.229.3 (21 May 2012 01:46:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 21 May 2012 01:46:41 +0000 (UTC) Cc: 10181@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 21 03:46:40 2012 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 1SWHhh-0006lg-Q6 for geb-bug-gnu-emacs@m.gmane.org; Mon, 21 May 2012 03:46:33 +0200 Original-Received: from localhost ([::1]:52166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWHhh-000333-7k for geb-bug-gnu-emacs@m.gmane.org; Sun, 20 May 2012 21:46:33 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:32971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWHhe-00032v-IW for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 21:46:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWHhb-00050t-NP for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 21:46:30 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:54629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWHhb-00050m-KE for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 21:46:27 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SWHiA-0005ZI-9W for bug-gnu-emacs@gnu.org; Sun, 20 May 2012 21:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 May 2012 01:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10181 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10181-submit@debbugs.gnu.org id=B10181.133756482021396 (code B ref 10181); Mon, 21 May 2012 01:47:01 +0000 Original-Received: (at 10181) by debbugs.gnu.org; 21 May 2012 01:47:00 +0000 Original-Received: from localhost ([127.0.0.1]:35942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWHi7-0005Z2-Mt for submit@debbugs.gnu.org; Sun, 20 May 2012 21:46:59 -0400 Original-Received: from ironport-out.teksavvy.com ([206.248.143.162]:38939) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWHhm-0005YQ-Hc for 10181@debbugs.gnu.org; Sun, 20 May 2012 21:46:56 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmgFAOMAh0/O+K+j/2dsb2JhbAA3oRSCLoEIgXYBBVYjEAs0EhQYDSSqJIxkDAODPgODcASjY4RY X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="181527425" Original-Received: from 206-248-175-163.dsl.teksavvy.com (HELO ceviche.home) ([206.248.175.163]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 20 May 2012 21:45:57 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id C379B660E0; Sun, 20 May 2012 21:45:54 -0400 (EDT) In-Reply-To: <87k406uz7n.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 21 May 2012 03:28:17 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:60242 Archived-At: > (defface diff-removed > - '((t :inherit diff-changed)) > + '((((class color) (min-colors 88)) > + :inherit diff-changed > + :background "#ffdddd") > + (((class color)) > + :inherit diff-changed > + :foreground "red" > + :weight normal > + :slant normal) > + (t > + :inherit diff-changed)) Please move the :inherit to a `default' clause instead of copying it into each one of the clauses. > @@ -393,7 +409,18 @@ (defvar diff-font-lock-keywords > ("^\\([+>]\\)\\(.*\n\\)" > (1 diff-indicator-added-face) (2 diff-added-face)) > ("^\\(!\\)\\(.*\n\\)" > - (1 diff-indicator-changed-face) (2 diff-changed-face)) > + (1 diff-indicator-changed-face) > + (2 > + (if (not (or (face-equal diff-changed-face diff-added-face) > + (face-equal diff-changed-face diff-removed-face))) Please introduce a defvar for it, so we don't re-evaluate the face comparison for each and every line. > +PROPS is an alist of properties to put (via overlays) on the changes, > +or only on removed characters when PROPS2 is non-nil. > +PROPS2 is an alist of properties to put on added characters. This doesn't say that PROPS will be put on the "removed" chars. And while I'm OK with not implementing the changed-added-remove scheme for refinement yet, I think that if we change the API of smerge-refine-subst for the added-removed case, we should make sure the API won't need to be changed yet again if/when we add the changed-added-removed scheme. Stefan