From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Juri Linkov <juri@jurta.org>
Cc: 10181@debbugs.gnu.org
Subject: bug#10181: 24.0.92; [wishlist] split `diff-refine-change' in several faces
Date: Sun, 20 May 2012 21:45:54 -0400 [thread overview]
Message-ID: <jwvmx52xqfk.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87k406uz7n.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 21 May 2012 03:28:17 +0300")
> (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
next prev parent reply other threads:[~2012-05-21 1:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-01 15:56 bug#10181: 24.0.92; [wishlist] split `diff-refine-change' in several faces Dani Moncayo
2011-12-02 10:47 ` Juri Linkov
2012-05-17 0:33 ` Juri Linkov
2012-05-17 1:37 ` Stefan Monnier
2012-05-18 0:32 ` Juri Linkov
2012-05-18 18:12 ` Stefan Monnier
2012-05-18 23:07 ` Juri Linkov
2012-05-19 18:24 ` Stefan Monnier
2012-05-19 23:55 ` Juri Linkov
2012-05-20 15:06 ` Stefan Monnier
2012-05-21 0:28 ` Juri Linkov
2012-05-21 1:45 ` Stefan Monnier [this message]
2012-05-23 0:36 ` Juri Linkov
2012-05-23 13:53 ` Stefan Monnier
2012-05-25 0:57 ` Juri Linkov
2012-05-25 13:21 ` Stefan Monnier
2012-05-25 20:35 ` Juri Linkov
2012-05-26 13:13 ` Stefan Monnier
2012-05-27 9:46 ` Juri Linkov
[not found] ` <handler.10181.D10181.133811261729958.notifdone@debbugs.gnu.org>
2012-09-30 16:38 ` Juri Linkov
2014-06-14 11:58 ` bug#10181: " Dani Moncayo
2014-06-14 12:54 ` Juri Linkov
2014-06-14 13:12 ` Juri Linkov
2014-06-16 6:55 ` Juri Linkov
2014-06-18 8:57 ` Juri Linkov
2014-06-18 9:14 ` Dani Moncayo
2014-06-19 6:54 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvmx52xqfk.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=10181@debbugs.gnu.org \
--cc=juri@jurta.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.