From: F. Jason Park <jp@neverwas.me>
Date: Fri, 19 May 2023 06:47:27 +0000 (-0700)
Subject: Fix custom type of erc-autojoin-channels-alist
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c297b828bb716885f92d3117c2abbb1ff21dbb08;p=emacs.git

Fix custom type of erc-autojoin-channels-alist

* lisp/erc/erc-join.el (erc-autojoin-channels-alist): In ERC 5.4, the
type of this option changed to accept symbols signifying IRC network
names.  However, the option's definition was not updated to reflect
that.  See commit 9bb8d90cddf "Allow irc network symbols in
erc-autojoin-channels-alist".
---

diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 17104da1a8b..45cfd565f89 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -78,10 +78,11 @@ keeps track of what channels you are on, and will join them
 again when you get disconnected.  When you restart Emacs, however,
 those changes are lost, and the customization you saved the last
 time is used again."
-  :type '(repeat (cons :tag "Server"
-		       (regexp :tag "Name")
-		       (repeat :tag "Channels"
-			       (string :tag "Name")))))
+  :type '(alist :options (Libera.Chat)
+                :key-type (choice :tag "Server"
+                                  (symbol :tag "Network")
+                                  (regexp :tag "Host or domain"))
+                :value-type (repeat :tag "Channels" (string :tag "Name"))))
 
 (defcustom erc-autojoin-timing 'connect
   "When ERC should attempt to autojoin a channel.