From patchwork Mon May 26 23:05:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42921 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A66A027BC4C; Tue, 27 May 2025 00:06:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C57A27BC4A for ; Tue, 27 May 2025 00:06:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJgtk-0003uh-R6; Mon, 26 May 2025 19:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJgtS-0003s2-Mp for guix-patches@gnu.org; Mon, 26 May 2025 19:06:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJgtS-0006KH-7V for guix-patches@gnu.org; Mon, 26 May 2025 19:06:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=1R+E9/eS5PUhRpuvuZZSRH/Ie/HE0tH0EGM2S9bZu08=; b=gMOw4welvADm70sfYLnaEcEVj22U7Ue3Vo5Lwzup4hHfO2XAFHhpyUBArqd3NBeHI+9cDZhFFw97MxlkbJofvegjmHCX/YHajnXXqukrNQ12+51tu5Nd3xFzPfiT82tgt26vPKz//CNXi4NjMAVhY/Nc2xEOSI3dpfu3nPG+pHiA59vbkLlyvyiw/l2eCFH+214fVWgAzFykGnRERxGe/5L6HdB8W824Vtpp0lRYd7v5+scdyVMG49cB6blr7/wrrB1iJnZ6Xv2pfP6ZeINhrXW61itkk6NZULK3FVMDBocVgMpMjTO6Vo746GkhYQN8Qh6OjwKMugIumcz/W/n9EA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uJgtS-0003mT-2T for guix-patches@gnu.org; Mon, 26 May 2025 19:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78599] [PATCH 6/7] gnu: emacs-origami: Fix invalid-face-box. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 May 2025 23:06:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78599 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78599@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78599-submit@debbugs.gnu.org id=B78599.174830074514407 (code B ref 78599); Mon, 26 May 2025 23:06:06 +0000 Received: (at 78599) by debbugs.gnu.org; 26 May 2025 23:05:45 +0000 Received: from localhost ([127.0.0.1]:33378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJgt6-0003kC-MD for submit@debbugs.gnu.org; Mon, 26 May 2025 19:05:44 -0400 Received: from 8.mo563.mail-out.ovh.net ([46.105.60.197]:42421) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uJgt2-0003jM-FS for 78599@debbugs.gnu.org; Mon, 26 May 2025 19:05:41 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4b5rw30Bxlz1fq5; Mon, 26 May 2025 23:05:39 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78599@debbugs.gnu.org>; Mon, 26 May 2025 23:05:38 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.102]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4b5rw2685pz1xy4; Mon, 26 May 2025 23:05:38 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7588C3A40DE; Mon, 26 May 2025 23:05:38 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-113S0074474c773-85a9-4e12-870c-d3e106bc60ff, C4981B8D6D379B1A4AD05DB46A021DB9630350EE) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 27 May 2025 01:05:22 +0200 Message-ID: <20250526230530.18545-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250526230530.18545-1-ngraves@ngraves.fr> References: <20250526230530.18545-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17564601498678911714 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgddukeektdculddtuddrgeefvddrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeehleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=1R+E9/eS5PUhRpuvuZZSRH/Ie/HE0tH0EGM2S9bZu08=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1748300739; v=1; b=J+4VPXqfjeI2m1DflM2N+FmVeWJ66GnwASREvHuDNjTnkZ+Cz549wq4AU7TCw/MjaFDxsX1k 8tzwFwMe5hpnLe/lpOcFXQATiwttZgfX7Wt0Nu/QUZD+BWbK1NWQ4oFlsgxawMgFZlVPpS65Qzp bjR8+gxTMhgNRYPi253ze4CcrKpjtBUjNv/HzMtBCMHz4LM2Rpz2lM5XmnDKEdeqfRTAMclYDMm P4JI2x/5DvWrWKU7ouFIbUXq3UklXox8euv//k61oNNaN/65m9VuRiqbwjpOThb0FwaHOe3iOnn 3Te/06Wys6RCZhX1kgN73T1KOYfTzbdTHmUNaJajI62EQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes face errors in the emacs-keystore-mode dependent package on emacs@30. * gnu/packages/emacs-xyz.scm (emacs-origami)[source]: Adapt to emacs@30 face API (:color unspecified has to be changed to :color nil). --- gnu/packages/emacs-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32e105288a..8ddf82098b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35778,7 +35778,10 @@ (define-public emacs-origami (("\\(require 'cl\\)") "(require 'cl-lib)") (("(destructuring-bind|remove-if)" all) - (string-append "cl-" all)))))) + (string-append "cl-" all)) + (("\\(face-attribute 'highlight :background\\)") "\ +(let ((color (face-attribute 'highlight :background))) + (and color (not (eq color 'unspecified)) color))"))))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash emacs-s)) (home-page "https://github.com/gregsexton/origami.el")