From patchwork Sun May 18 08:16:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42721 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 A0FA327BC4A; Sun, 18 May 2025 09:20:33 +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 397A627BC4E for ; Sun, 18 May 2025 09:20:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGZG2-0007NV-98; Sun, 18 May 2025 04:20:30 -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 1uGZFg-0006uP-OY for guix-patches@gnu.org; Sun, 18 May 2025 04:20: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 1uGZFg-00027u-0r for guix-patches@gnu.org; Sun, 18 May 2025 04:20:08 -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=UDi9j+mMcyrZggyRa03YKJkkqSsw+bXheWOyC1rV23Q=; b=CdO5kxM+rEXIkGNqD7j+EbJVOAOne4tckiwCYWrEZ/dWlGkS9RwBWZT3HvMN6hxmbVdRpjsJ3syz5MKS+Hlvi4NJ7p4OBj959rFivNlDkVt+ZVJ4JZQ6vY6KZ84Zy0G2N3zl756aGQdWNpvp/3HWmjMfJjMGhJdGPB/o3AU9gbq/Rh8KfHlgSIYJ7fHUdTtOUFeAqKmbOdLFxsxJuG7Qot1fo2YXyS0vLfluaZmU1dgkjcYZOTT4nYaDWbsnD2EuYDzxkxxF0BSLfXfjGjj12n1EHpIw4oSnqSCsI0MeQUMIgF1tNjJWl57B+eJdAkdhZMpJVy7vIIn5aU5/iU42mw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGZFf-0002Iw-Na for guix-patches@gnu.org; Sun, 18 May 2025 04:20:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH v3 42/53] gnu: emacs-origami: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 May 2025 08:20:07 +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.17475563698694 (code B ref 78315); Sun, 18 May 2025 08:20:07 +0000 Received: (at 78315) by debbugs.gnu.org; 18 May 2025 08:19:29 +0000 Received: from localhost ([127.0.0.1]:55259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGZF3-0002G9-4p for submit@debbugs.gnu.org; Sun, 18 May 2025 04:19:29 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:45205) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGZEI-00029V-8u for 78315@debbugs.gnu.org; Sun, 18 May 2025 04:18:42 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4b0YcH5JYqz1QZC; Sun, 18 May 2025 08:18:39 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78315@debbugs.gnu.org>; Sun, 18 May 2025 08:18:39 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.24]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4b0YcH3z78z5xKP; Sun, 18 May 2025 08:18:39 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id A22FBDA3B4B; Sun, 18 May 2025 08:18:38 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003acf90830-792b-4f89-b188-650eeac3107f, C6CD5D64AC962E3586D42D3C4756DC5C3DD92CD7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.171.108 Date: Sun, 18 May 2025 10:16:41 +0200 Message-ID: <20250518081658.11362-42-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518081658.11362-1-ngraves@ngraves.fr> References: <20250518081658.11362-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10943465622928679650 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefudektdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeelrddvtdejrddujedurddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeefudehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=UDi9j+mMcyrZggyRa03YKJkkqSsw+bXheWOyC1rV23Q=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1747556319; v=1; b=St1Py6Z+zCY+d0opiVtitU2GTgLY19GGqh7e7ldYdR2kzmAEGm7k73NfQtU0mGnAUGqExd0Y 6PTGz76Tauz1Iq9uTO9XA1DL5R4FsE6JUDuBFyZ3XwOnUdC+972wIgkWfJaV+am0bU3KSqfmXSK tCipbMOYBVl71uxI1ZH5dm+6Jzpie2o74p/9W/4QxApZJn2wnI5JsoKimtGA3LZ2P+FWt0Gkuu8 tUwD4vr9pILVtiNJpqhbvvaJRMkbi51boqgFdY1xaWhBy1Y5RtOmu9yE3vhRQACRTCH9cBSASaQ PLs4hLa8FA3Q83WA3eelmpImAU5icZGeUruqycLAT5FMA== 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 22d05bbe4e..0998439a23 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35815,8 +35815,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)) @@ -35828,24 +35827,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))))