From patchwork Sat May 14 23:05:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fredrik Salomonsson X-Patchwork-Id: 39265 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 C76A927BBEA; Sun, 15 May 2022 00:06:44 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 92F2627BBE9 for ; Sun, 15 May 2022 00:06:44 +0100 (BST) Received: from localhost ([::1]:41222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0qR-0007Zd-Qb for patchwork@mira.cbaines.net; Sat, 14 May 2022 19:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0pn-0007J2-CQ for guix-patches@gnu.org; Sat, 14 May 2022 19:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0pm-0001UJ-J3 for guix-patches@gnu.org; Sat, 14 May 2022 19:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0pm-0002ki-Ev for guix-patches@gnu.org; Sat, 14 May 2022 19:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55420] [PATCH 1/2] guix: emacs-utils: Add emacs-batch-script. References: <20220514230017.27372-1-plattfot@posteo.net> In-Reply-To: <20220514230017.27372-1-plattfot@posteo.net> Resent-From: Fredrik Salomonsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 23:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55420@debbugs.gnu.org Cc: Fredrik Salomonsson Received: via spool by 55420-submit@debbugs.gnu.org id=B55420.165256952210513 (code B ref 55420); Sat, 14 May 2022 23:06:02 +0000 Received: (at 55420) by debbugs.gnu.org; 14 May 2022 23:05:22 +0000 Received: from localhost ([127.0.0.1]:47705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0p8-0002jU-IL for submit@debbugs.gnu.org; Sat, 14 May 2022 19:05:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0p7-0002jG-AC for 55420@debbugs.gnu.org; Sat, 14 May 2022 19:05:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 81DBB240026 for <55420@debbugs.gnu.org>; Sun, 15 May 2022 01:05:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1652569515; bh=nLx4SCMIiphivWa8LKGj/QosQ91bRVpPl9ClRBXDdgo=; h=From:To:Cc:Subject:Date:From; b=QlanBXaZby38Pny+B9mYRgIDbAEHP/ixHxJ4GqrEqaf9MJLUQGFr1f/G2AwSlXVeZ cdUD5PRssgyD6ronRXwUcitOkkfSanmftJhPyk0Q6pEMZk8+m7kipuBKoLjkxC4Xgx 0bhrsy5tCwSUInxp6ZNQrHpsAKh/fDugxzn/oWiHkBjdXKQ9dFKllRxgMgchksyet5 +Lvr1+8O+FYUBSehIfmGK09t3J0DzjS9qrSROVRf4oPkPqQW+eA5JQ1VSWSKShJL0h L3fmpxsyWQhpi9m4Y1jP+fqAPwRpFG8T/SHkpSifiE/WxBzqXQI/fV3sPDjVVrfw9N 4QuQDCPpzeibg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4L11Ly4LH7z9rxD; Sun, 15 May 2022 01:05:14 +0200 (CEST) From: Fredrik Salomonsson Date: Sat, 14 May 2022 23:05:07 +0000 Message-Id: <20220514230508.27885-1-plattfot@posteo.net> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/emacs-utils.scm (emacs-batch-script): New procedure. --- guix/build/emacs-utils.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 60a754b9e9..8d40b9e139 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2018, 2020, 2022 Maxim Cournoyer ;;; Copyright © 2019 Liliana Marie Prikler +;;; Copyright © 2022 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,10 +23,13 @@ (define-module (guix build emacs-utils) #:use-module (guix build utils) #:use-module (ice-9 format) + #:use-module (ice-9 popen) + #:use-module (ice-9 rdelim) #:export (%emacs emacs-batch-eval emacs-batch-edit-file emacs-batch-disable-compilation + emacs-batch-script emacs-generate-autoloads emacs-byte-compile-directory @@ -69,6 +73,15 @@ (define (emacs-batch-disable-compilation file) (add-file-local-variable 'no-byte-compile t) (basic-save-buffer)))) +(define (emacs-batch-script expr) + "Execute the Elisp code EXPR in Emacs batch mode and return output." + (call-with-port + (open-pipe* + OPEN_READ + (%emacs) "--quick" "--batch" + (string-append "--eval=" (expr->string expr))) + read-string)) + (define (emacs-generate-autoloads name directory) "Generate autoloads for Emacs package NAME placed in DIRECTORY." (let* ((file (string-append directory "/" name "-autoloads.el")) From patchwork Sat May 14 23:05:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Salomonsson X-Patchwork-Id: 39264 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 D780127BBEA; Sun, 15 May 2022 00:06:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 AB4A527BBE9 for ; Sun, 15 May 2022 00:06:26 +0100 (BST) Received: from localhost ([::1]:40664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq0q9-0007K6-Rs for patchwork@mira.cbaines.net; Sat, 14 May 2022 19:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq0pn-0007J3-CS for guix-patches@gnu.org; Sat, 14 May 2022 19:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq0pm-0001UK-V9 for guix-patches@gnu.org; Sat, 14 May 2022 19:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq0pm-0002kq-Qf for guix-patches@gnu.org; Sat, 14 May 2022 19:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55420] [PATCH 2/2] guix: emacs-utils: Add emacs-header-parse. Resent-From: Fredrik Salomonsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 May 2022 23:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55420@debbugs.gnu.org Cc: Fredrik Salomonsson Received: via spool by 55420-submit@debbugs.gnu.org id=B55420.165256952810533 (code B ref 55420); Sat, 14 May 2022 23:06:02 +0000 Received: (at 55420) by debbugs.gnu.org; 14 May 2022 23:05:28 +0000 Received: from localhost ([127.0.0.1]:47708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0pD-0002jo-SR for submit@debbugs.gnu.org; Sat, 14 May 2022 19:05:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49189) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq0pC-0002jN-8H for 55420@debbugs.gnu.org; Sat, 14 May 2022 19:05:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B8D7D240026 for <55420@debbugs.gnu.org>; Sun, 15 May 2022 01:05:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1652569520; bh=Pu/HOC61G0Zl7SmN/IWgSls5vEmEqNNli7SWC9nb/Nw=; h=From:To:Cc:Subject:Date:From; b=as/scnpVFw3WPbbF5/N1Db8ylJ1A5bHhYnTyxEd9wWxpsMv7pnzsFp10UPzkj8A4a N1kWZ7mJxTn+TQDM923NXNqiDuohGbZo8xZLRqe8kL1VQrB67X7f9QLtU8ItR0dO9M h+gJ84hDurbS5PihsvkHZ8J9cyEetE0erAN6YohRCpTzRnHwYydDkFNHuPfAiEa8si crdXstPVjpDZqSTv+JgBF/itgkJmRmpGAIph5z1EqqM7CclT6/Lv215vph1WG9jUBj VS6KpzNVjxo5xL85GxpFkqNxr8ygaPBo33n8b6/DW0BzO50XKh7Ip47tH6tKRAj0fZ v2ZNWLrf2FmYg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4L11M40p7tz6tn0; Sun, 15 May 2022 01:05:19 +0200 (CEST) From: Fredrik Salomonsson Date: Sat, 14 May 2022 23:05:08 +0000 Message-Id: <20220514230508.27885-2-plattfot@posteo.net> In-Reply-To: <20220514230508.27885-1-plattfot@posteo.net> References: <20220514230508.27885-1-plattfot@posteo.net> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/emacs-utils.scm (emacs-header-parse): New procedure. --- guix/build/emacs-utils.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 8d40b9e139..76d9464806 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -32,6 +32,7 @@ (define-module (guix build emacs-utils) emacs-batch-script emacs-generate-autoloads emacs-byte-compile-directory + emacs-header-parse as-display emacs-substitute-sexps @@ -97,6 +98,14 @@ (define* (emacs-byte-compile-directory dir) (byte-recompile-directory (file-name-as-directory ,dir) 0 1)))) (emacs-batch-eval expr))) +(define (emacs-header-parse section file) + "Parse the header SECTION in FILE and return it as a string." + (emacs-batch-script + `(progn + (require 'lisp-mnt) + (find-file ,file) + (princ (lm-header ,section))))) + (define as-display ;syntactic keyword for 'emacs-substitute-sexps' '(as display))