From fbea62f829f92da63b65d96d09a2a48b77b2c3d1 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 10 May 2023 00:00:53 +0200
Subject: gnu: emacs-gerbil-mode: Move to scheme.scm.

This fixes a bug due to a top-level circular reference:

  $ guix show scheme48
  [...]
  ice-9/boot-9.scm:1685:16: In procedure raise-exception:
  error: gerbil: unbound variable

* gnu/packages/emacs-xyz.scm (emacs-gerbil-mode): Move to...
* gnu/packages/scheme.scm (emacs-gerbil-mode): ... here.
---
 gnu/packages/emacs-xyz.scm | 16 ----------------
 gnu/packages/scheme.scm    | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4ddd9a36dd..a5d1453398 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -36259,22 +36259,6 @@ audio volume via amixer.")
 Fennel code within Emacs.")
       (license license:gpl3+))))
 
-(define-public emacs-gerbil-mode
-  (package
-    (inherit gerbil)
-    (name "emacs-gerbil-mode")
-    (version "1.0")
-    (build-system emacs-build-system)
-    (arguments
-     (list #:phases #~(modify-phases %standard-phases
-                        (add-before 'install 'change-directory
-                          (lambda _
-                            (chdir "etc"))))))
-    (synopsis "Emacs major-mode for editing Gerbil code")
-    (description
-     "Gerbil mode provides font-lock, indentation, navigation, and REPL for
-Gerbil code within Emacs.")))
-
 (define-public emacs-org-modern
   (package
    (name "emacs-org-modern")
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 1cfc21d69b..a0b547bfc7 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -51,6 +51,7 @@
   #:use-module (guix utils)
   #:use-module (guix build-system asdf)
   #:use-module (guix build-system copy)
+  #:use-module (guix build-system emacs)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages autotools)
@@ -1211,3 +1212,19 @@ is that Gerbil modules are single instantiation, supporting high performance ahe
 time compilation and compiled macros.")
     (home-page "https://cons.io")
     (license `(,lgpl2.1 ,asl2.0))))
+
+(define-public emacs-gerbil-mode
+  (package
+    (inherit gerbil)
+    (name "emacs-gerbil-mode")
+    (version "1.0")
+    (build-system emacs-build-system)
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-before 'install 'change-directory
+                          (lambda _
+                            (chdir "etc"))))))
+    (synopsis "Emacs major-mode for editing Gerbil code")
+    (description
+     "Gerbil mode provides font-lock, indentation, navigation, and REPL for
+Gerbil code within Emacs.")))
-- 
cgit v1.2.3