From edfbdb3f1655b1a61fa7a060041e5e58f32bb4a5 Mon Sep 17 00:00:00 2001
From: "F. Jason Park" <jp@neverwas.me>
Date: Fri, 9 Jun 2023 23:34:58 -0700
Subject: [PATCH] Define missing groups for ERC modules

* lisp/erc/erc-imenu.el (erc-imenu): Define group even though there
aren't any associated faces or user options because `imenu' is a
global module, and `define-erc-module' calls `define-minor-mode',
which needs a group for its mode variable.  This should have been
handled by bug#60954 but wasn't.
* lisp/erc/erc-sound.el (erc-sound): Move group definition above
module definition.
* lisp/erc/erc-spelling.el (erc-spelling): Define group.
---
 lisp/erc/erc-imenu.el    | 4 ++++
 lisp/erc/erc-sound.el    | 8 ++++----
 lisp/erc/erc-spelling.el | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 60df4e9ac8e..f053c6279b8 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -41,6 +41,10 @@
 (require 'erc)
 (require 'imenu)
 
+(defgroup erc-imenu nil
+  "Imenu integration for ERC."
+  :group 'erc)
+
 (defun erc-unfill-notice ()
   "Return text from point to a computed end as a string unfilled.
 Don't rely on this function, read it first!"
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 9da9202f0cf..083d72805df 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -47,6 +47,10 @@
 
 (require 'erc)
 
+(defgroup erc-sound nil
+  "Make ERC play bells and whistles while chatting with people."
+  :group 'erc)
+
 ;;;###autoload(put 'ctcp-sound 'erc--module 'sound)
 ;;;###autoload(autoload 'erc-sound-mode "erc-sound")
 (define-erc-module sound ctcp-sound
@@ -61,10 +65,6 @@ and play sound files as requested."
 
 (erc-define-catalog-entry 'english 'CTCP-SOUND "%n (%u@%h) plays %s:%m")
 
-(defgroup erc-sound nil
-  "Make ERC play bells and whistles while chatting with people."
-  :group 'erc)
-
 (defcustom erc-play-sound t
   "Play sounds when you receive CTCP SOUND requests."
   :type 'boolean)
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 8e5424f4162..83eb849f1b4 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -33,6 +33,10 @@
 (require 'erc)
 (require 'flyspell)
 
+(defgroup erc-spelling nil
+  "Flyspell integration for ERC."
+  :group 'erc)
+
 ;;;###autoload(autoload 'erc-spelling-mode "erc-spelling" nil t)
 (define-erc-module spelling nil
   "Enable flyspell mode in ERC buffers."
-- 
2.39.2