From patchwork Fri Jan 31 20:02:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 20052 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 A9A7316708; Fri, 31 Jan 2020 20:03:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7CCBF166FF for ; Fri, 31 Jan 2020 20:03:10 +0000 (GMT) Received: from localhost ([::1]:59040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixcVR-0001Q9-VU for patchwork@mira.cbaines.net; Fri, 31 Jan 2020 15:03:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39291) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixcVM-0001Pu-9L for guix-patches@gnu.org; Fri, 31 Jan 2020 15:03:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixcVL-00016n-96 for guix-patches@gnu.org; Fri, 31 Jan 2020 15:03:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixcVL-00012F-64 for guix-patches@gnu.org; Fri, 31 Jan 2020 15:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ixcVK-00041L-3q for guix-patches@gnu.org; Fri, 31 Jan 2020 15:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39375] [PATCH] gnu: emacs-utils: Port to emacs-next. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Jan 2020 20:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39375 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39375@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158050096515430 (code B ref -1); Fri, 31 Jan 2020 20:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jan 2020 20:02:45 +0000 Received: from localhost ([127.0.0.1]:38133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixcV2-00040o-PD for submit@debbugs.gnu.org; Fri, 31 Jan 2020 15:02:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:53010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ixcV1-00040h-OU for submit@debbugs.gnu.org; Fri, 31 Jan 2020 15:02:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39014) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixcV0-00014b-6P for guix-patches@gnu.org; Fri, 31 Jan 2020 15:02:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixcUy-0000JH-Jl for guix-patches@gnu.org; Fri, 31 Jan 2020 15:02:41 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:30190) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixcUy-0000Dt-3H for guix-patches@gnu.org; Fri, 31 Jan 2020 15:02:40 -0500 Received: from localhost.localdomain (194-118-251-194.hdsl.highway.telekom.at [194.118.251.194]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 488Sn80YsSz1LgFk for ; Fri, 31 Jan 2020 21:02:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 488Sn80YsSz1LgFk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1580500956; bh=qD/QeNXEwWcJGpzFFXr9ddz/szKS3Dlr3Bc1A2Imwt8=; h=From:To:Subject:Date:From; b=YzKsgfq2YDgLissivelON4VuH1kiMFsy4fK7Vfm/y7tQNuyYKQqOMOnt8A9CbhvbY HCqFhgXvhgB+63ylKzI6JoyF5MKpCo42b2XuQRewoJVM5B15eyEpkDPDmnIu5CiCIB TIiKYSjkXHiViPCpt6XxujvnD3uQ/BcRhn3iUztQ= From: Leo Prikler Date: Fri, 31 Jan 2020 21:02:23 +0100 Message-Id: <20200131200222.23792-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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-eval*): New variable. (emacs-generate-autoloads): Redefine in terms of emacs-batch-eval*. Require autoload (needed with emacs-next). --- guix/build/emacs-utils.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 885fd0a217..1462f9d0af 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -23,6 +23,7 @@ #:use-module (guix build utils) #:export (%emacs emacs-batch-eval + emacs-batch-eval* emacs-batch-edit-file emacs-batch-disable-compilation emacs-generate-autoloads @@ -46,6 +47,14 @@ (invoke (%emacs) "--quick" "--batch" (format #f "--eval=~S" expr))) +(define (emacs-batch-eval* . exprs) + "Run Emacs in batch mode, and execute all of the elisp expressions EXPRS." + (apply invoke (%emacs) "--quick" "--batch" + (map + (lambda (expr) + (format #f "--eval=~S" expr)) + exprs))) + (define (emacs-batch-edit-file file expr) "Load FILE in Emacs using batch mode, and execute the elisp code EXPR." (invoke (%emacs) "--quick" "--batch" @@ -64,7 +73,7 @@ (expr `(let ((backup-inhibited t) (generated-autoload-file ,file)) (update-directory-autoloads ,directory)))) - (emacs-batch-eval expr))) + (emacs-batch-eval* '(require 'autoload) expr))) (define* (emacs-byte-compile-directory dir) "Byte compile all files in DIR and its sub-directories."