From patchwork Thu May 8 12:50:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42456 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 4F93527BC4A; Thu, 8 May 2025 13:54:27 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 5174E27BC4E for ; Thu, 8 May 2025 13:54:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD0kE-0007oC-Ms; Thu, 08 May 2025 08:52:58 -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 1uD0jl-0007P6-6F for guix-patches@gnu.org; Thu, 08 May 2025 08:52:29 -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 1uD0jk-0005yQ-Rr for guix-patches@gnu.org; Thu, 08 May 2025 08:52:28 -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=Q0eTNKcYhgKdZ/bhKY7aoH7uoXU4gBhAi4P38fGgq60=; b=P3cXR5EIqhmf0twWE3mtg8Jdd2RVBTnC3o9qx7xiIkSvya+rZqCk9OxsnBl4Ua7Gps6S6kWtWUUZOcLpeizTJZOXuC91w5t8mOU1qbMt46MIrF0/9wySNoX/5Smwsb4kiOkq236xyCGa+C5kvIbDmoc/TM+33eSR/Cv9nyMLBiqVn+c33l/EvaKeB3wqH9Pkk6FLsPuCXM+pgiRMjUk3AcpL9snCtPlxcDkjLPlLEHaRFT+d1hN9djnYJveX5pKuBiDy6lrhe80kJzUIiUD57zVvXhxF7QJ8USJIKNtGrSBW8vrMcRhsXgJy8KitwWN6Ll1Ft3NTsG8fKMLDVNRtqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uD0jk-0001aL-KX for guix-patches@gnu.org; Thu, 08 May 2025 08:52:28 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH 43/53] gnu: emacs-origami: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 12:52:28 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78315-submit@debbugs.gnu.org id=B78315.17467087335839 (code B ref 78315); Thu, 08 May 2025 12:52:28 +0000 Received: (at 78315) by debbugs.gnu.org; 8 May 2025 12:52:13 +0000 Received: from localhost ([127.0.0.1]:55499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uD0jV-0001Vx-2B for submit@debbugs.gnu.org; Thu, 08 May 2025 08:52:13 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:53333) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uD0jD-0001PH-23 for 78315@debbugs.gnu.org; Thu, 08 May 2025 08:51:55 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX8B0k9Bz1Zkh; Thu, 8 May 2025 12:51:54 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78315@debbugs.gnu.org>; Thu, 8 May 2025 12:51:53 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.83]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX895f8Mz61s8; Thu, 8 May 2025 12:51:53 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.2]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 61BBFDA3AE0; Thu, 8 May 2025 12:51:53 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003cc1778bd-4c24-44ca-9485-f9aa92bd0a1e, DDC873FDB2A8922E808BA1EA95701B978C004A90) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 8 May 2025 14:50:45 +0200 Message-ID: <20250508125104.26530-43-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508125104.26530-1-ngraves@ngraves.fr> References: <20250508125104.26530-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12171259469824123618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeljeelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpeeknecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Q0eTNKcYhgKdZ/bhKY7aoH7uoXU4gBhAi4P38fGgq60=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746708714; v=1; b=XIX6G1s6bySbzmrHdCI/cSiFLMRsQpn31v1eC3Iu8RXbR2GmZIIPMcuJDLzgDiz6ugHH3UeC bkGyqhYGWVt4Rv1S093ffFpR2DTD4VwM0XwVim58712LfKYRsgR4XpBmgksCPqxL3sAHUEgp4Yj iFIPJr+Anf2Lde7xb6fNcDzQAGq1mrMkgHRFKOt8XyZW0VJiLILOc4Z6DjMdC4/f2X8jtaGgWB3 1mpn9OeuoJrfCqQV/+yOqG3JZ/IiIS7x2PiCzPa6iTeKZoCRsN/iT21l0kcqAQFqA77yEfB2Q5g wuSTWLKV8iN95s6vsFuS5fehQ9Cq1Ppsnphl10oI2X8Iw== 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 * gnu/packages/emacs-xyz.scm (emacs-origami): Run guix style. [source]: Use a instead of an obscure patch to replace cl. --- gnu/packages/emacs-xyz.scm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 38f6481897..38c1f07b75 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35819,8 +35819,7 @@ (define-public emacs-rjsx-mode (define-public emacs-origami (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366") (version "1.0") - (revision "1") - (patch "1d9c4f120c027a5009b0424270e3aae59f1cb128")) + (revision "1")) (package (name "emacs-origami") (version (git-version version revision commit)) @@ -35832,24 +35831,19 @@ (define-public emacs-origami (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x")) - (patches - (list - (origin - (method url-fetch) - (uri (string-append - "https://github.com/gregsexton/origami.el" - "/commit/" patch ".patch")) - (sha256 - (base32 - "0yia4dhqjzdidxd77s2ggg6mmj05jbsnwc35myzzhzh1zbq8mrfy"))))))) + (base32 "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x")) + (modules '((guix build utils))) + (snippet #~(substitute* (find-files "." "\\.el$") + (("\\(require 'cl\\)") + "(require 'cl-lib)") + (("(destructuring-bind|remove-if)" all) + (string-append "cl-" all)))))) (build-system emacs-build-system) - (propagated-inputs - (list emacs-dash emacs-s)) + (propagated-inputs (list emacs-dash emacs-s)) (home-page "https://github.com/gregsexton/origami.el") (synopsis "Flexible text-folding") - (description "This package provides a minor mode for collapsing and + (description + "This package provides a minor mode for collapsing and expanding regions of text without modifying the actual contents.") (license license:expat))))