From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id +8nNJk0UOV/WdAAA0tVLHw (envelope-from ) for ; Sun, 16 Aug 2020 11:11:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uKh8Ik0UOV8mYAAA1q6Kng (envelope-from ) for ; Sun, 16 Aug 2020 11:11:09 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F322E940654 for ; Sun, 16 Aug 2020 11:11:07 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id E62DE1FF7B; Sun, 16 Aug 2020 07:10:57 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) by mail.notmuchmail.org (Postfix) with ESMTPS id B38B41FC8D for ; Sun, 16 Aug 2020 07:10:54 -0400 (EDT) Received: from mithlond.arda (mobile-access-bceeee-200.dhcp.inet.fi [188.238.238.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: tlikonen) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id E7F211B0029D; Sun, 16 Aug 2020 14:10:50 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1597576251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9Q+1WRHLD9QxH8pYmztwd2H++LmZ/4AC7+hzl0eMAjc=; b=PYXKh51gSPPxgPtMhZRB4cHqSF7rS1ocg196YKKBEmsnIHRr2fuisorx6REWVS2CmSEKfa 1Xcb6RM1hlDD7nc3dU+VZtgpkZs5/rfZdr6T1TaI/r1GU98CVAC50+HREfLn9kiqtHAEX8 nT5efCheJLMYy+zR24Zju55ParLCzADETp45L/Hm4+hRfQgDWJnYJqAU1shKrqGOV3kT63 W2UstvbMWWJI7TLTuPNmofPo64nXODquUgjgREx2ITPcKgRMpN/Y7BlemwunRk5zWdpJcb AysAqjzN8tFHF479OzQz3WrL7gT0z+Xm/yk6tUKIfnglu+OcNsH+gWdxxmH5Fg== From: Teemu Likonen To: notmuch@notmuchmail.org Cc: Jonas Bernoulli Subject: [PATCH] Emacs: Fix notmuch-message-summary-face definition Date: Sun, 16 Aug 2020 14:10:43 +0300 Message-Id: <20200816111043.15939-1-tlikonen@iki.fi> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1597576251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9Q+1WRHLD9QxH8pYmztwd2H++LmZ/4AC7+hzl0eMAjc=; b=eOT/MZDDpsaOnjIfzBXrvttUw77Y6q3+rWYudIuOHjKZejivvqoTtvHadlCh1v6zApKLZn zYpI0XPZUcBme3fd3uEdWyHQ8eschYEjgEQrw0A7Suu10dFhr3pffxm3qY2PSxFlw8Kh2Y FQf4Dy244fdjlznTj2VGfHcnunEtFN2FSHpSSPA1Ht2a5Ut/0jQsR/FxVhbKPu2vI6ZxOo He8XVg0QPG7uXH1l/wgMYidiJONmYZQVi5LAK7OwwsaVyGV0ZCShC2Ajgd5/yHeSb+zcVq 0XLmmDVi8kuzoGCyK5f+WA8noyg7pagodaeyj7oT+NLsQRI4AG8zqwJRy8ZMYQ== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1597576251; a=rsa-sha256; cv=none; b=Jpa4E/x4VcqeK0mHRQl+KKzGF/05/0f57nAwLlWlUXuDv7SWslQztTfw25MDTytvn/slpx 3KESK/gie/ISNqlYlGpcqngT8zQ3kdmtxF8cIR8leFt0G7jI7XILGUT8UdHho7NYPcOOhJ 2liita5w7oF5bJK4WQiJ2ffAT6b28dd1i5qwJnxEuLR/XVKnsZZCcdwUKm0leHAVtSLH1W AH+8KRH/DAtLKRE4vCga7NvFti9UgTM0kqlOzXRq7mo42+JpcilObervnOVCiH1OSWT99q 8BybPlXVAaVbXKsLssKXhBf7DOL2SwGE2ue7F7gtHRJS5FCDv5ZovN3r7ZQV9A== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=tlikonen smtp.mailfrom=tlikonen@iki.fi Message-ID-Hash: XFKTSMDWKY6PQNFWJT4UKCYF6GEPJ64D X-Message-ID-Hash: XFKTSMDWKY6PQNFWJT4UKCYF6GEPJ64D X-MailFrom: tlikonen@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=iki.fi header.s=lahtoruutu header.b=PYXKh51g; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 3.03 X-TUID: kxDfnBP/oXM9 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 (:background "#f0f0f0" :extend t)) (DISPLAY (:background "#303030" :extend t))) which follows the (DISPLAY PLIST) format (see above). --- emacs/notmuch.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index babddbb6..16227b5c 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -274,11 +274,9 @@ 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" ,@(if (>= emacs-major-version 27) '(:extend t)))) (((class color) (background dark)) - ,@(and (>= emacs-major-version 27) '(:extend t)) - (:background "#303030"))) + (:background "#303030" ,@(if (>= emacs-major-version 27) '(:extend t))))) "Face for the single-line message summary in notmuch-show-mode." :group 'notmuch-show :group 'notmuch-faces) -- 2.20.1