From: Teemu Likonen <tlikonen@iki.fi>
To: notmuch@notmuchmail.org
Cc: Jonas Bernoulli <jonas@bernoul.li>
Subject: [PATCH v2] Emacs: Fix notmuch-message-summary-face definition
Date: Sun, 16 Aug 2020 20:13:23 +0300 [thread overview]
Message-ID: <20200816171323.3425-1-tlikonen@iki.fi> (raw)
In-Reply-To: <87tux24s31.fsf@bernoul.li>
Emacs face definition forms are either
((DISPLAY . PLIST)
(DISPLAY . PLIST))
or
((DISPLAY PLIST) ;For backward compatibility.
(DISPLAY PLIST))
Commit a2388bc56e55da5d5695816818274f8a84b0ed92 (2020-08-08) follows
neither of the correct formats. It defines:
`((((class color) (background light))
,@(and (>= emacs-major-version 27) '(:extend t))
(:background "#f0f0f0"))
(((class color) (background dark))
,@(and (>= emacs-major-version 27) '(:extend t))
(:background "#303030")))
which produces:
((DISPLAY
:extend t (:background "#f0f0f0"))
(DISPLAY
:extend t (:background "#303030")))
And that is wrong format.
This change fixes the face definition form to produce:
((DISPLAY
:extend t :background "#f0f0f0")
(DISPLAY
:extend t :background "#303030"))
which follows the (DISPLAY . PLIST) format (see above).
---
emacs/notmuch.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
* 2020-08-16 15:51:14+02, Jonas Bernoulli wrote:
> I would recommend that you
> - switch to using the new format
> - keep the `:extend' setting on its own line
> - keep the `:extend' at the beginning of the list
The new format is the only meaningful change but OK.
> - use `and' instead of `if' because
> - it is better to use `when' instead of `if' when
> there is no ELSE part
I disagree with that. I think IF is more about return values and WHEN
about longer code with side effects.
> - it is better to use `and' instead of `when` when
> the form is about the returned value, not some
> side-effect
To me AND is more like multiple condition for "if all the forms are
non-nil" and IF is more about return values. Obviously they are
techinally the same.
Nevertheless, I changed my IF's to AND's so there is now the smallest
possible diff in this version.
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index babddbb6..04123595 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -275,10 +275,10 @@ there will be called at other points of notmuch execution."
(defface notmuch-message-summary-face
`((((class color) (background light))
,@(and (>= emacs-major-version 27) '(:extend t))
- (:background "#f0f0f0"))
+ :background "#f0f0f0")
(((class color) (background dark))
,@(and (>= emacs-major-version 27) '(:extend t))
- (:background "#303030")))
+ :background "#303030"))
"Face for the single-line message summary in notmuch-show-mode."
:group 'notmuch-show
:group 'notmuch-faces)
--
2.20.1
next prev parent reply other threads:[~2020-08-16 17:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-16 11:10 [PATCH] Emacs: Fix notmuch-message-summary-face definition Teemu Likonen
2020-08-16 13:51 ` Jonas Bernoulli
2020-08-16 17:13 ` Teemu Likonen [this message]
2020-08-22 12:51 ` [PATCH v2] " David Bremner
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
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200816171323.3425-1-tlikonen@iki.fi \
--to=tlikonen@iki.fi \
--cc=jonas@bernoul.li \
--cc=notmuch@notmuchmail.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 public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).