diff options
| author | Amin Bandali | 2021-07-03 23:39:18 -0400 |
|---|---|---|
| committer | Amin Bandali | 2021-07-03 23:39:18 -0400 |
| commit | 348b2aed0c8c3630be4c15c8e70acf7ea9c023af (patch) | |
| tree | 4a4a1c388b277a557c9328086abab6762afa80cc | |
| parent | b0e725e2fee2b6713eb724ef9812d6534750054d (diff) | |
| download | emacs-348b2aed0c8c3630be4c15c8e70acf7ea9c023af.tar.gz emacs-348b2aed0c8c3630be4c15c8e70acf7ea9c023af.zip | |
Update IRC-related references to point to Libera.Chat
Per GNU and FSF's announcements [0, 1] of moving official IRC channels
to the Libera.Chat IRC network, as well as several Emacs-related
channels following suit [2], update IRC-related references to reflect
the migration.
[0]: https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html
[1]: https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html
[2]: https://lists.gnu.org/archive/html/info-gnu-emacs/2021-06/msg00000.html
| -rw-r--r-- | doc/misc/erc.texi | 56 | ||||
| -rw-r--r-- | doc/misc/gnus-faq.texi | 2 | ||||
| -rw-r--r-- | doc/misc/rcirc.texi | 41 | ||||
| -rw-r--r-- | etc/NEWS | 23 | ||||
| -rw-r--r-- | lisp/erc/erc-backend.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-networks.el | 14 | ||||
| -rw-r--r-- | lisp/erc/erc-services.el | 27 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 11 | ||||
| -rw-r--r-- | lisp/ldefs-boot.el | 2 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 8 | ||||
| -rw-r--r-- | lisp/org/ol-irc.el | 6 |
11 files changed, 128 insertions, 64 deletions
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index d39613c11a9..951535fa316 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi | |||
| @@ -131,21 +131,30 @@ customize-variable @key{RET} erc-modules @key{RET}}. | |||
| 131 | @node Sample Session | 131 | @node Sample Session |
| 132 | @section Sample Session | 132 | @section Sample Session |
| 133 | 133 | ||
| 134 | This is an example ERC session which shows how to connect to the #emacs | 134 | This is an example ERC session which shows how to connect to the |
| 135 | channel on Freenode. Another IRC channel on Freenode that may be of | 135 | #emacs channel on Libera.Chat. Another IRC channel on Libera.Chat |
| 136 | interest is #erc, which is a channel where ERC users and developers hang | 136 | that may be of interest is #erc, which is a channel where ERC users |
| 137 | out. | 137 | and developers hang out. These channels used to live on the Freenode |
| 138 | IRC network until June 2021, when they---along with the official IRC | ||
| 139 | channels of the GNU Project, the Free Software Foundation, and many | ||
| 140 | other free software communities---relocated to the Libera.Chat network | ||
| 141 | in the aftermath of changes in governance and policies of Freenode in | ||
| 142 | May and June 2021. GNU and FSF's announcements about this are at | ||
| 143 | @uref{https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html}, | ||
| 144 | @uref{https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html}, | ||
| 145 | and | ||
| 146 | @uref{https://lists.gnu.org/archive/html/info-gnu-emacs/2021-06/msg00000.html}. | ||
| 138 | 147 | ||
| 139 | @itemize @bullet | 148 | @itemize @bullet |
| 140 | 149 | ||
| 141 | @item Connect to Freenode | 150 | @item Connect to Libera.Chat |
| 142 | 151 | ||
| 143 | Run @kbd{M-x erc}. Use ``irc.freenode.net'' as the IRC server, ``6667'' | 152 | Run @kbd{M-x erc}. Use ``irc.libera.chat as the IRC server, ``6667'' |
| 144 | as the port, and choose a nickname. | 153 | as the port, and choose a nickname. |
| 145 | 154 | ||
| 146 | @item Get used to the interface | 155 | @item Get used to the interface |
| 147 | 156 | ||
| 148 | Switch to the ``irc.freenode.net:6667'' buffer, if you're not already | 157 | Switch to the ``irc.libera.chat:6667'' buffer, if you're not already |
| 149 | there. You will see first some messages about checking for ident, and | 158 | there. You will see first some messages about checking for ident, and |
| 150 | then a bunch of other messages that describe the current IRC server. | 159 | then a bunch of other messages that describe the current IRC server. |
| 151 | 160 | ||
| @@ -158,13 +167,14 @@ background. If the latter, switch to the ``#emacs'' buffer. You will | |||
| 158 | see the channel topic and a list of the people who are currently on the | 167 | see the channel topic and a list of the people who are currently on the |
| 159 | channel. | 168 | channel. |
| 160 | 169 | ||
| 161 | @item Register your nickname with Freenode | 170 | @item Register your nickname with Libera.Chat |
| 162 | 171 | ||
| 163 | If you would like to be able to talk with people privately on the | 172 | If you would like to be able to talk with people privately on the |
| 164 | Freenode network, you will have to ``register'' your nickname. To do | 173 | Libera.Chat network, you will have to ``register'' your nickname. |
| 165 | so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg | 174 | To do so, switch to the ``irc.libera.chat:6667'' buffer and type |
| 166 | NickServ register <password>'', replacing ``<password>'' with your | 175 | ``/msg NickServ register <password>'', replacing ``<password>'' with |
| 167 | desired password. It should tell you that the operation was successful. | 176 | your desired password. It should tell you that the operation was |
| 177 | successful. | ||
| 168 | 178 | ||
| 169 | @item Talk to people in the channel | 179 | @item Talk to people in the channel |
| 170 | 180 | ||
| @@ -518,7 +528,7 @@ That is, if called with the following arguments, @var{server} and | |||
| 518 | parameters. | 528 | parameters. |
| 519 | 529 | ||
| 520 | @example | 530 | @example |
| 521 | (erc :server "irc.freenode.net" :full-name "Harry S Truman") | 531 | (erc :server "irc.libera.chat" :full-name "J. Random Hacker") |
| 522 | @end example | 532 | @end example |
| 523 | @end defun | 533 | @end defun |
| 524 | 534 | ||
| @@ -691,10 +701,10 @@ stuff, to the current ERC buffer." | |||
| 691 | (erc-send-message | 701 | (erc-send-message |
| 692 | (concat "@{Uptime@} [" uname-output "]")))) | 702 | (concat "@{Uptime@} [" uname-output "]")))) |
| 693 | 703 | ||
| 694 | ;; This causes ERC to connect to the Freenode network upon hitting | 704 | ;; This causes ERC to connect to the Libera.Chat network upon hitting |
| 695 | ;; C-c e f. Replace MYNICK with your IRC nick. | 705 | ;; C-c e f. Replace MYNICK with your IRC nick. |
| 696 | (global-set-key "\C-cef" (lambda () (interactive) | 706 | (global-set-key "\C-cef" (lambda () (interactive) |
| 697 | (erc :server "irc.freenode.net" :port "6667" | 707 | (erc :server "irc.libera.chat" :port "6667" |
| 698 | :nick "MYNICK"))) | 708 | :nick "MYNICK"))) |
| 699 | 709 | ||
| 700 | ;; This causes ERC to connect to the IRC server on your own machine (if | 710 | ;; This causes ERC to connect to the IRC server on your own machine (if |
| @@ -714,13 +724,15 @@ stuff, to the current ERC buffer." | |||
| 714 | 724 | ||
| 715 | ;;; Options | 725 | ;;; Options |
| 716 | 726 | ||
| 717 | ;; Join the #emacs and #erc channels whenever connecting to Freenode. | 727 | ;; Join the #emacs and #erc channels whenever connecting to |
| 718 | (setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc"))) | 728 | ;; Libera.Chat. |
| 729 | (setq erc-autojoin-channels-alist | ||
| 730 | '(("Libera.Chat" "#emacs" "#erc"))) | ||
| 719 | 731 | ||
| 720 | ;; Rename server buffers to reflect the current network name instead | 732 | ;; Rename server buffers to reflect the current network name instead |
| 721 | ;; of SERVER:PORT (e.g., "freenode" instead of "irc.freenode.net:6667"). | 733 | ;; of SERVER:PORT (e.g., "Libera.Chat" instead of |
| 722 | ;; This is useful when using a bouncer like ZNC where you have multiple | 734 | ;; "irc.libera.chat:6667"). This is useful when using a bouncer like |
| 723 | ;; connections to the same server. | 735 | ;; ZNC where you have multiple connections to the same server. |
| 724 | (setq erc-rename-buffers t) | 736 | (setq erc-rename-buffers t) |
| 725 | 737 | ||
| 726 | ;; Interpret mIRC-style color commands in IRC chats | 738 | ;; Interpret mIRC-style color commands in IRC chats |
| @@ -760,7 +772,7 @@ If non, @code{nil}, this is a list of IRC networks and message types | |||
| 760 | to hide, e.g.: | 772 | to hide, e.g.: |
| 761 | 773 | ||
| 762 | @example | 774 | @example |
| 763 | (setq erc-network-hide-list (("freenode" "JOIN" "PART" "QUIT") | 775 | (setq erc-network-hide-list (("Libera.Chat" "JOIN" "PART" "QUIT") |
| 764 | ("OFTC" "JOIN" "PART"")) | 776 | ("OFTC" "JOIN" "PART"")) |
| 765 | @end example | 777 | @end example |
| 766 | @end defopt | 778 | @end defopt |
| @@ -809,7 +821,7 @@ You can ask questions about using ERC on the Emacs mailing list, | |||
| 809 | @uref{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs}. | 821 | @uref{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs}. |
| 810 | 822 | ||
| 811 | @item | 823 | @item |
| 812 | You can visit the IRC Freenode channel @samp{#emacs}. Many of the | 824 | You can visit the IRC Libera.Chat channel @samp{#emacs}. Many of the |
| 813 | contributors are frequently around and willing to answer your | 825 | contributors are frequently around and willing to answer your |
| 814 | questions. | 826 | questions. |
| 815 | 827 | ||
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 96503138e56..455819745de 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi | |||
| @@ -2144,7 +2144,7 @@ I need real-time help, where to find it? | |||
| 2144 | 2144 | ||
| 2145 | @subsubheading Answer | 2145 | @subsubheading Answer |
| 2146 | 2146 | ||
| 2147 | Point your IRC client to irc.freenode.net, channel #gnus. | 2147 | Point your IRC client to irc.libera.chat, channel #gnus. |
| 2148 | 2148 | ||
| 2149 | @node FAQ 9 - Tuning Gnus | 2149 | @node FAQ 9 - Tuning Gnus |
| 2150 | @subsection Tuning Gnus | 2150 | @subsection Tuning Gnus |
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index 85eab4c443e..c636cdee159 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi | |||
| @@ -124,10 +124,11 @@ server in a network, and servers relay messages from one to the next. | |||
| 124 | Here's a typical example: | 124 | Here's a typical example: |
| 125 | 125 | ||
| 126 | @cindex redirection to random servers | 126 | @cindex redirection to random servers |
| 127 | When you connect to the Freenode network | 127 | When you connect to the Libera.Chat network |
| 128 | (@code{http://freenode.net/}), you point your IRC client at the | 128 | (@code{https://libera.chat}), you point your IRC client at the |
| 129 | server @code{irc.freenode.net}. That server will redirect your client | 129 | server @code{irc.libera.chat}. That server will redirect your client |
| 130 | to a random server on the network, such as @code{zelazny.freenode.net}. | 130 | to a random server on the network, such as |
| 131 | @code{zirconium.libera.chat}. | ||
| 131 | 132 | ||
| 132 | @cindex channel name | 133 | @cindex channel name |
| 133 | @cindex # starts a channel name | 134 | @cindex # starts a channel name |
| @@ -171,15 +172,23 @@ using a different nick. This will prompt you for four things: | |||
| 171 | 172 | ||
| 172 | @table @asis | 173 | @table @asis |
| 173 | @cindex server, connecting | 174 | @cindex server, connecting |
| 174 | @cindex Freenode network | 175 | @cindex Libera.Chat network |
| 175 | @item IRC Server | 176 | @item IRC Server |
| 176 | What server do you want to connect to? All the servers in a particular | 177 | What server do you want to connect to? All the servers in a particular |
| 177 | network are equivalent. Some networks use a round-robin system where a | 178 | network are equivalent. Some networks use a round-robin system where |
| 178 | single server redirects new connections to a random server in the | 179 | a single server redirects new connections to a random server in the |
| 179 | network. @code{irc.freenode.net} is such a server for the Freenode | 180 | network. @code{irc.libera.chat} is such a server for the Libera.Chat |
| 180 | network. Freenode provides the network ``for the Free and Open Source | 181 | network. Libera.Chat's purpose is ``to provide services such as a |
| 181 | Software communities, for not-for-profit organizations and for related | 182 | community platform for free open-source software and peer directed |
| 182 | communities and organizations.'' | 183 | projects on a volunteer basis,'' and was chosen as the official home |
| 184 | of the GNU Project and the Free Software Foundation's IRC channels in | ||
| 185 | June 2021 in the aftermath of the changes in governance and policies | ||
| 186 | of the Freenode IRC network. GNU and FSF's announcements about this | ||
| 187 | are at | ||
| 188 | @uref{https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html}, | ||
| 189 | @uref{https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html}, | ||
| 190 | and | ||
| 191 | @uref{https://lists.gnu.org/archive/html/info-gnu-emacs/2021-06/msg00000.html}. | ||
| 183 | 192 | ||
| 184 | @cindex port, connecting | 193 | @cindex port, connecting |
| 185 | @cindex 6667, default IRC port | 194 | @cindex 6667, default IRC port |
| @@ -205,13 +214,13 @@ in use, you might for example get assigned the nick @code{alex`}. | |||
| 205 | A space separated list of channels you want to join when connecting. | 214 | A space separated list of channels you want to join when connecting. |
| 206 | You don't need to join any channels, if you just want to have one-to-one | 215 | You don't need to join any channels, if you just want to have one-to-one |
| 207 | conversations with friends on the same network. If you're new to the | 216 | conversations with friends on the same network. If you're new to the |
| 208 | Freenode network, join @code{#emacs}, the channel about all things | 217 | Libera.Chat network, join @code{#emacs}, the channel about all things |
| 209 | Emacs, or join @code{#rcirc}, the channel about @code{rcirc}. | 218 | Emacs, or join @code{#rcirc}, the channel about @code{rcirc}. |
| 210 | @end table | 219 | @end table |
| 211 | 220 | ||
| 212 | @cindex server buffer | 221 | @cindex server buffer |
| 213 | When you have answered these questions, @code{rcirc} will create a server | 222 | When you have answered these questions, @code{rcirc} will create a server |
| 214 | buffer, which will be named something like @file{*irc.freenode.net*}, | 223 | buffer, which will be named something like @file{*irc.libera.chat*}, |
| 215 | and a channel buffer for each of the channels you wanted to join. | 224 | and a channel buffer for each of the channels you wanted to join. |
| 216 | 225 | ||
| 217 | @kindex RET | 226 | @kindex RET |
| @@ -482,7 +491,7 @@ Here's an example of how to set it: | |||
| 482 | @end example | 491 | @end example |
| 483 | 492 | ||
| 484 | By default you will be connected to the @code{rcirc} support channel: | 493 | By default you will be connected to the @code{rcirc} support channel: |
| 485 | @code{#rcirc} on @code{irc.freenode.net}. | 494 | @code{#rcirc} on @code{irc.libera.chat}. |
| 486 | 495 | ||
| 487 | @table @code | 496 | @table @code |
| 488 | @item :nick | 497 | @item :nick |
| @@ -554,8 +563,8 @@ Here is an example to illustrate how you would set it: | |||
| 554 | 563 | ||
| 555 | @example | 564 | @example |
| 556 | (setq rcirc-authinfo | 565 | (setq rcirc-authinfo |
| 557 | '(("freenode" nickserv "bob" "p455w0rd") | 566 | '(("Libera.Chat" nickserv "bob" "p455w0rd") |
| 558 | ("freenode" chanserv "bob" "#bobland" "passwd99") | 567 | ("Libera.Chat" chanserv "bob" "#bobland" "passwd99") |
| 559 | ("bitlbee" bitlbee "robert" "sekrit"))) | 568 | ("bitlbee" bitlbee "robert" "sekrit"))) |
| 560 | @end example | 569 | @end example |
| 561 | 570 | ||
| @@ -30,6 +30,29 @@ applies, and please also update docstrings as needed. | |||
| 30 | 30 | ||
| 31 | * Changes in Emacs 27.3 | 31 | * Changes in Emacs 27.3 |
| 32 | 32 | ||
| 33 | +++ | ||
| 34 | ** Update IRC-related references to point to Libera.Chat. | ||
| 35 | In June 2021, the Free Software Foundation and the GNU Project moved | ||
| 36 | their official IRC channels from the Freenode network to Libera.Chat | ||
| 37 | in the aftermath of the changes in Freenode's governance structure and | ||
| 38 | policies in May and June 2021. The decision-making process took into | ||
| 39 | account the feedback received from the community against a set of | ||
| 40 | criteria devised by a working group drawn from both GNU and the FSF | ||
| 41 | to gauge a chat network's acceptability to software freedom activists. | ||
| 42 | |||
| 43 | For the original announcement and the follow-up update, including more | ||
| 44 | details, see: | ||
| 45 | |||
| 46 | https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html | ||
| 47 | https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html | ||
| 48 | |||
| 49 | Given the relocation of GNU and FSF's official IRC channels, as well | ||
| 50 | as #emacs and various other Emacs-themed channels (see the link below) | ||
| 51 | to Libera.Chat, IRC-related references in the Emacs repository have | ||
| 52 | now been updated to point to Libera.Chat. | ||
| 53 | |||
| 54 | https://lists.gnu.org/archive/html/info-gnu-emacs/2021-06/msg00000.html | ||
| 55 | |||
| 33 | 56 | ||
| 34 | * Editing Changes in Emacs 27.3 | 57 | * Editing Changes in Emacs 27.3 |
| 35 | 58 | ||
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index dcda9044a55..2c2f62e76ed 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el | |||
| @@ -1793,7 +1793,7 @@ See `erc-display-server-message'." nil | |||
| 1793 | 's324 ?c channel ?m modes))) | 1793 | 's324 ?c channel ?m modes))) |
| 1794 | 1794 | ||
| 1795 | (define-erc-response-handler (328) | 1795 | (define-erc-response-handler (328) |
| 1796 | "Channel URL (on freenode network)." nil | 1796 | "Channel URL." nil |
| 1797 | (let ((channel (cadr (erc-response.command-args parsed))) | 1797 | (let ((channel (cadr (erc-response.command-args parsed))) |
| 1798 | (url (erc-response.contents parsed))) | 1798 | (url (erc-response.contents parsed))) |
| 1799 | (erc-display-message parsed 'notice (erc-get-buffer channel proc) | 1799 | (erc-display-message parsed 'notice (erc-get-buffer channel proc) |
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 4a566096cb1..ac32b294d3c 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el | |||
| @@ -290,6 +290,13 @@ | |||
| 290 | ("LagNet: Random server" LagNet "irc.lagnet.org.za" 6667) | 290 | ("LagNet: Random server" LagNet "irc.lagnet.org.za" 6667) |
| 291 | ("LagNet: AF, ZA, Cape Town" LagNet "reaper.lagnet.org.za" 6667) | 291 | ("LagNet: AF, ZA, Cape Town" LagNet "reaper.lagnet.org.za" 6667) |
| 292 | ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667) | 292 | ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667) |
| 293 | ("Libera.Chat: Random server" Libera.Chat "irc.libera.chat" 6667) | ||
| 294 | ("Libera.Chat: Random Europe server" Libera.Chat "irc.eu.libera.chat" 6667) | ||
| 295 | ("Libera.Chat: Random US & Canada server" Libera.Chat "irc.us.libera.chat" 6667) | ||
| 296 | ("Libera.Chat: Random Australia & New Zealand server" Libera.Chat "irc.au.libera.chat" 6667) | ||
| 297 | ("Libera.Chat: Random East Asia server" Libera.Chat "irc.ea.libera.chat" 6667) | ||
| 298 | ("Libera.Chat: IPv4 only server" Libera.Chat "irc.ipv4.libera.chat" 6667) | ||
| 299 | ("Libera.Chat: IPv6 only server" Libera.Chat "irc.ipv6.libera.chat" 6667) | ||
| 293 | ("Librenet: Random server" Librenet "irc.librenet.net" 6667) | 300 | ("Librenet: Random server" Librenet "irc.librenet.net" 6667) |
| 294 | ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669))) | 301 | ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669))) |
| 295 | ("LinuxChix: Random server" LinuxChix "irc.linuxchix.org" 6667) | 302 | ("LinuxChix: Random server" LinuxChix "irc.linuxchix.org" 6667) |
| @@ -595,6 +602,7 @@ PORTS is either a number, a list of numbers, or a list of port ranges." | |||
| 595 | (Krono "krono.net") | 602 | (Krono "krono.net") |
| 596 | (Krushnet "krushnet.org") | 603 | (Krushnet "krushnet.org") |
| 597 | (LagNet "lagnet.org.za") | 604 | (LagNet "lagnet.org.za") |
| 605 | (Libera.Chat "libera.chat") | ||
| 598 | (Librenet "librenet.net") | 606 | (Librenet "librenet.net") |
| 599 | (LinkNet "link-net.org") | 607 | (LinkNet "link-net.org") |
| 600 | (LinuxChix "cats\\.meow\\.at\\|linuxchix\\.org") | 608 | (LinuxChix "cats\\.meow\\.at\\|linuxchix\\.org") |
| @@ -836,8 +844,8 @@ As an example: | |||
| 836 | ;; think it is worth the effort. | 844 | ;; think it is worth the effort. |
| 837 | 845 | ||
| 838 | (defvar erc-settings | 846 | (defvar erc-settings |
| 839 | '((pals freenode ("kensanata" "shapr" "anti\\(fuchs\\|gone\\)")) | 847 | '((pals Libera.Chat ("kensanata" "shapr" "anti\\(fuchs\\|gone\\)")) |
| 840 | (format-nick-function (freenode "#emacs") erc-format-@nick)) | 848 | (format-nick-function (Libera.Chat "#emacs") erc-format-@nick)) |
| 841 | "Experimental: Alist of configuration options. | 849 | "Experimental: Alist of configuration options. |
| 842 | The format is (VARNAME SCOPE VALUE) where | 850 | The format is (VARNAME SCOPE VALUE) where |
| 843 | VARNAME is a symbol identifying the configuration option, | 851 | VARNAME is a symbol identifying the configuration option, |
| @@ -866,7 +874,7 @@ VALUE is the options value.") | |||
| 866 | items nil))))) | 874 | items nil))))) |
| 867 | val)) | 875 | val)) |
| 868 | 876 | ||
| 869 | (erc-get 'pals 'freenode) | 877 | (erc-get 'pals 'Libera.Chat) |
| 870 | 878 | ||
| 871 | (provide 'erc-networks) | 879 | (provide 'erc-networks) |
| 872 | 880 | ||
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index 4f9b0b199f9..f04da183c64 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el | |||
| @@ -30,10 +30,10 @@ | |||
| 30 | ;; are made to test if NickServ is the real NickServ for a given network or | 30 | ;; are made to test if NickServ is the real NickServ for a given network or |
| 31 | ;; server. | 31 | ;; server. |
| 32 | 32 | ||
| 33 | ;; As a default, ERC has the data for the official nickname services on | 33 | ;; As a default, ERC has the data for the official nickname services |
| 34 | ;; the networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, GRnet, | 34 | ;; on the networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, |
| 35 | ;; and Slashnet. You can add more by using M-x customize-variable RET | 35 | ;; GRnet, Libera.Chat, and Slashnet. You can add more by using |
| 36 | ;; erc-nickserv-alist. | 36 | ;; M-x customize-variable RET erc-nickserv-alist. |
| 37 | 37 | ||
| 38 | ;; Usage: | 38 | ;; Usage: |
| 39 | ;; | 39 | ;; |
| @@ -43,9 +43,10 @@ | |||
| 43 | ;; (erc-services-mode 1) | 43 | ;; (erc-services-mode 1) |
| 44 | ;; | 44 | ;; |
| 45 | ;; Add your nickname and NickServ password to `erc-nickserv-passwords'. | 45 | ;; Add your nickname and NickServ password to `erc-nickserv-passwords'. |
| 46 | ;; Using the freenode network as an example: | 46 | ;; Using the Libera.Chat network as an example: |
| 47 | ;; | 47 | ;; |
| 48 | ;; (setq erc-nickserv-passwords '((freenode (("nickname" "password"))))) | 48 | ;; (setq erc-nickserv-passwords |
| 49 | ;; '((Libera.Chat (("nickname" "password"))))) | ||
| 49 | ;; | 50 | ;; |
| 50 | ;; The default automatic identification mode is autodetection of NickServ | 51 | ;; The default automatic identification mode is autodetection of NickServ |
| 51 | ;; identify requests. Set the variable `erc-nickserv-identify-mode' if | 52 | ;; identify requests. Set the variable `erc-nickserv-identify-mode' if |
| @@ -173,8 +174,8 @@ You can also use \\[erc-nickserv-identify-mode] to change modes." | |||
| 173 | 174 | ||
| 174 | Example of use: | 175 | Example of use: |
| 175 | (setq erc-nickserv-passwords | 176 | (setq erc-nickserv-passwords |
| 176 | \\='((freenode ((\"nick-one\" . \"password\") | 177 | \\='((Libera.Chat ((\"nick-one\" . \"password\") |
| 177 | (\"nick-two\" . \"password\"))) | 178 | (\"nick-two\" . \"password\"))) |
| 178 | (DALnet ((\"nick\" . \"password\")))))" | 179 | (DALnet ((\"nick\" . \"password\")))))" |
| 179 | :group 'erc-services | 180 | :group 'erc-services |
| 180 | :type '(repeat | 181 | :type '(repeat |
| @@ -190,6 +191,7 @@ Example of use: | |||
| 190 | (const GalaxyNet) | 191 | (const GalaxyNet) |
| 191 | (const GRnet) | 192 | (const GRnet) |
| 192 | (const iip) | 193 | (const iip) |
| 194 | (const Libera.Chat) | ||
| 193 | (const OFTC) | 195 | (const OFTC) |
| 194 | (const QuakeNet) | 196 | (const QuakeNet) |
| 195 | (const Rizon) | 197 | (const Rizon) |
| @@ -257,6 +259,15 @@ Example of use: | |||
| 257 | "type\\s-/squery\\s-Trent\\s-identify\\s-<password>" | 259 | "type\\s-/squery\\s-Trent\\s-identify\\s-<password>" |
| 258 | "Trent@anon.iip" | 260 | "Trent@anon.iip" |
| 259 | "IDENTIFY" nil "SQUERY" nil) | 261 | "IDENTIFY" nil "SQUERY" nil) |
| 262 | (Libera.Chat | ||
| 263 | "NickServ!NickServ@services.libera.chat" | ||
| 264 | ;; Libera.Chat also accepts a password at login, see the `erc' | ||
| 265 | ;; :password argument. | ||
| 266 | "This\\s-nickname\\s-is\\s-registered.\\s-Please\\s-choose" | ||
| 267 | "NickServ" | ||
| 268 | "IDENTIFY" nil nil | ||
| 269 | ;; See also the 901 response code message. | ||
| 270 | "You\\s-are\\s-now\\s-identified\\s-for\\s-") | ||
| 260 | (OFTC | 271 | (OFTC |
| 261 | "NickServ!services@services.oftc.net" | 272 | "NickServ!services@services.oftc.net" |
| 262 | ;; OFTC's NickServ doesn't ask you to identify anymore. | 273 | ;; OFTC's NickServ doesn't ask you to identify anymore. |
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 1e055a6c521..2bd58ba9379 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -255,7 +255,7 @@ A typical value would be \(\"JOIN\" \"PART\" \"QUIT\")." | |||
| 255 | 255 | ||
| 256 | (defcustom erc-network-hide-list nil | 256 | (defcustom erc-network-hide-list nil |
| 257 | "A list of IRC networks to hide message types from. | 257 | "A list of IRC networks to hide message types from. |
| 258 | A typical value would be \((\"freenode\" \"MODE\") | 258 | A typical value would be \((\"Libera.Chat\" \"MODE\") |
| 259 | \(\"OFTC\" \"JOIN\" \"QUIT\"))." | 259 | \(\"OFTC\" \"JOIN\" \"QUIT\"))." |
| 260 | :version "25.1" | 260 | :version "25.1" |
| 261 | :group 'erc-ignore | 261 | :group 'erc-ignore |
| @@ -1499,7 +1499,7 @@ Defaults to the server buffer." | |||
| 1499 | 1499 | ||
| 1500 | ;; activation | 1500 | ;; activation |
| 1501 | 1501 | ||
| 1502 | (defconst erc-default-server "irc.freenode.net" | 1502 | (defconst erc-default-server "irc.libera.chat" |
| 1503 | "IRC server to use if it cannot be detected otherwise.") | 1503 | "IRC server to use if it cannot be detected otherwise.") |
| 1504 | 1504 | ||
| 1505 | (defconst erc-default-port 6667 | 1505 | (defconst erc-default-port 6667 |
| @@ -2229,7 +2229,7 @@ Non-interactively, it takes the keyword arguments | |||
| 2229 | 2229 | ||
| 2230 | That is, if called with | 2230 | That is, if called with |
| 2231 | 2231 | ||
| 2232 | (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\") | 2232 | (erc :server \"irc.libera.chat\" :full-name \"J. Random Hacker\") |
| 2233 | 2233 | ||
| 2234 | then the server and full-name will be set to those values, whereas | 2234 | then the server and full-name will be set to those values, whereas |
| 2235 | `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will | 2235 | `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will |
| @@ -3355,8 +3355,9 @@ to send. | |||
| 3355 | 3355 | ||
| 3356 | If only one word is given, display the mode of that target. | 3356 | If only one word is given, display the mode of that target. |
| 3357 | 3357 | ||
| 3358 | A list of valid mode strings for Freenode may be found at | 3358 | A list of valid mode strings for Libera.Chat may be found at |
| 3359 | URL `http://freenode.net/using_the_network.shtml'." | 3359 | `https://libera.chat/guides/channelmodes' and |
| 3360 | `https://libera.chat/guides/usermodes'." | ||
| 3360 | (cond | 3361 | (cond |
| 3361 | ((string-match "^\\s-\\(.*\\)$" line) | 3362 | ((string-match "^\\s-\\(.*\\)$" line) |
| 3362 | (let ((s (match-string 1 line))) | 3363 | (let ((s (match-string 1 line))) |
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index b0ab27bc4cf..71b107e071c 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el | |||
| @@ -10679,7 +10679,7 @@ Non-interactively, it takes the keyword arguments | |||
| 10679 | 10679 | ||
| 10680 | That is, if called with | 10680 | That is, if called with |
| 10681 | 10681 | ||
| 10682 | (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\") | 10682 | (erc :server \"irc.libera.chat\" :full-name \"J. Random Hacker\") |
| 10683 | 10683 | ||
| 10684 | then the server and full-name will be set to those values, whereas | 10684 | then the server and full-name will be set to those values, whereas |
| 10685 | `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will | 10685 | `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will |
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 02965881ea5..d4472572d6b 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -56,9 +56,9 @@ | |||
| 56 | :group 'applications) | 56 | :group 'applications) |
| 57 | 57 | ||
| 58 | (defcustom rcirc-server-alist | 58 | (defcustom rcirc-server-alist |
| 59 | '(("irc.freenode.net" :channels ("#rcirc") | 59 | '(("irc.libera.chat" :channels ("#rcirc") |
| 60 | ;; Don't use the TLS port by default, in case gnutls is not available. | 60 | ;; Don't use the TLS port by default, in case gnutls is not available. |
| 61 | ;; :port 7000 :encryption tls | 61 | ;; :port 6697 :encryption tls |
| 62 | )) | 62 | )) |
| 63 | "An alist of IRC connections to establish when running `rcirc'. | 63 | "An alist of IRC connections to establish when running `rcirc'. |
| 64 | Each element looks like (SERVER-NAME PARAMETERS). | 64 | Each element looks like (SERVER-NAME PARAMETERS). |
| @@ -249,8 +249,8 @@ The ARGUMENTS for each METHOD symbol are: | |||
| 249 | `quakenet': ACCOUNT PASSWORD | 249 | `quakenet': ACCOUNT PASSWORD |
| 250 | 250 | ||
| 251 | Examples: | 251 | Examples: |
| 252 | ((\"freenode\" nickserv \"bob\" \"p455w0rd\") | 252 | ((\"Libera.Chat\" nickserv \"bob\" \"p455w0rd\") |
| 253 | (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\") | 253 | (\"Libera.Chat\" chanserv \"bob\" \"#bobland\" \"passwd99\") |
| 254 | (\"bitlbee\" bitlbee \"robert\" \"sekrit\") | 254 | (\"bitlbee\" bitlbee \"robert\" \"sekrit\") |
| 255 | (\"dal.net\" nickserv \"bob\" \"sekrit\" \"NickServ@services.dal.net\") | 255 | (\"dal.net\" nickserv \"bob\" \"sekrit\" \"NickServ@services.dal.net\") |
| 256 | (\"quakenet.org\" quakenet \"bobby\" \"sekrit\"))" | 256 | (\"quakenet.org\" quakenet \"bobby\" \"sekrit\"))" |
diff --git a/lisp/org/ol-irc.el b/lisp/org/ol-irc.el index e3d7651c1a1..df62dd06257 100644 --- a/lisp/org/ol-irc.el +++ b/lisp/org/ol-irc.el | |||
| @@ -39,9 +39,9 @@ | |||
| 39 | ;; | 39 | ;; |
| 40 | ;; Links within an org buffer might look like this: | 40 | ;; Links within an org buffer might look like this: |
| 41 | ;; | 41 | ;; |
| 42 | ;; [[irc:/irc.freenode.net/#emacs/bob][chat with bob in #emacs on freenode]] | 42 | ;; [[irc:/irc.libera.chat/#emacs/bob][chat with bob in #emacs on Libera.Chat]] |
| 43 | ;; [[irc:/irc.freenode.net/#emacs][#emacs on freenode]] | 43 | ;; [[irc:/irc.libera.chat/#emacs][#emacs on Libera.Chat]] |
| 44 | ;; [[irc:/irc.freenode.net/]] | 44 | ;; [[irc:/irc.libera.chat/]] |
| 45 | ;; | 45 | ;; |
| 46 | ;; If, when the resulting link is visited, there is no connection to a | 46 | ;; If, when the resulting link is visited, there is no connection to a |
| 47 | ;; requested server then one will be created. | 47 | ;; requested server then one will be created. |