From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeJVG-0004SL-C9 for guix-patches@gnu.org; Wed, 24 Jan 2018 06:46:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeJVC-0000Jy-6H for guix-patches@gnu.org; Wed, 24 Jan 2018 06:46:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:60734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeJVC-0000JP-2c for guix-patches@gnu.org; Wed, 24 Jan 2018 06:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eeJVB-0006Pq-P7 for guix-patches@gnu.org; Wed, 24 Jan 2018 06:46:01 -0500 Subject: [bug#30147] Simplify =?UTF-8?Q?=E2=80=9Cscripts/guix=E2=80=9D?= Resent-Message-ID: From: Mathieu Lirzin References: <87inc0i8yt.fsf@gnu.org> <87fu6x7x9m.fsf@gnu.org> <87efmg92si.fsf@gnu.org> <87bmhk7jxq.fsf@gnu.org> Date: Wed, 24 Jan 2018 12:45:16 +0100 In-Reply-To: <87bmhk7jxq.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 23 Jan 2018 15:01:53 +0100") Message-ID: <87efmf32gj.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 30147-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello again, ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Mathieu Lirzin skribis: > >> From 77379bbf2642762927c01cc7f10eb5761626f172 Mon Sep 17 00:00:00 2001 >> From: Mathieu Lirzin >> Date: Tue, 23 Jan 2018 12:52:33 +0100 >> Subject: [PATCH] guix: Refactor script. >> MIME-Version: 1.0 >> Content-Type: text/plain; charset=3DUTF-8 >> Content-Transfer-Encoding: 8bit >> >> * scripts/guix.in: Remove empty surrounding =E2=80=98let=E2=80=99. Defi= ne 'main' as the >> procedure called when running the script. >> (maybe-augment-load-paths!): Rename to ... >> (augment-load-paths!): ... this. Use 'and=3D>' for 'file-exists?'. >> (run-guix-main): Rename to ... >> (main): ... this. Call 'augment-load-paths!'. > > Works for me. Applied and pushed, thanks! Thanks for applying this. I didn't notice that Emacs stopped setting =E2=80=98scheme-mode=E2=80=99 au= tomatically due to the extra line implied by the use of the Guile meta switch. Here is a fix to please Emacs. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-guix-Let-Emacs-detect-scripts-guix.in-appropriate-mo.patch Content-Transfer-Encoding: quoted-printable >From a798d6b7fa3b71faf85b4d415de99abccbfe7aab Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Wed, 24 Jan 2018 12:29:17 +0100 Subject: [PATCH] =3D?UTF-8?q?guix:=3D20Let=3D20Emacs=3D20detect=3D20=3DE2= =3D80=3D9Cscripts?=3D =3D?UTF-8?q?/guix.in=3DE2=3D80=3D9D=3D20appropriate=3D20mode.?=3D MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Since commit 6f774d481839f87178c5895ac2d661e141f879b8 which introduces the = use of Guile's meta switch in =E2=80=9Cscripts/guix.in=E2=80=9D, Emacs was not = using =E2=80=98scheme-mode=E2=80=99 for this file. * scripts/guix.in: Replace "-*- scheme -*-" with a local variable. --- scripts/guix.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/guix.in b/scripts/guix.in index e0f0ae7e0..d1c12eae5 100644 --- a/scripts/guix.in +++ b/scripts/guix.in @@ -1,6 +1,5 @@ #!@GUILE@ \ --no-auto-compile -e main -s --*- scheme -*- !# ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013 Mark H Weaver @@ -57,3 +56,7 @@ ;; but since the 'guix' command is not updated by 'guix pull', we cann= ot ;; really do it now. (apply guix-main args))) + +;;; Local Variables: +;;; mode: scheme +;;; End: --=20 2.16.0 --=-=-= Content-Type: text/plain Sorry for the mess. -- Mathieu Lirzin GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37 --=-=-=--