Don't load erc-goodies atop erc.el
* lisp/erc/erc.el: Commit c2d657e7c4
"Move ERC's core dependencies to a separate file" ironed out ERC's
interwoven dependencies for the better but didn't cleanly sidestep the
goodies interdependency, specifically with regard to custom options.
This reverts the tiny portion impacting this aspect by once again
requiring `erc-goodies' at the very end of ERC's main library. Special
thanks to Libera.Chat user jrm for reporting this bug.
This commit is contained in:
parent
40cf494b7c
commit
628b624176
1 changed files with 2 additions and 1 deletions
|
@ -61,7 +61,6 @@
|
||||||
(load "erc-loaddefs" 'noerror 'nomessage)
|
(load "erc-loaddefs" 'noerror 'nomessage)
|
||||||
|
|
||||||
(require 'erc-networks)
|
(require 'erc-networks)
|
||||||
(require 'erc-goodies)
|
|
||||||
(require 'erc-backend)
|
(require 'erc-backend)
|
||||||
(require 'cl-lib)
|
(require 'cl-lib)
|
||||||
(require 'format-spec)
|
(require 'format-spec)
|
||||||
|
@ -7386,4 +7385,6 @@ Customize `erc-url-connect-function' to override this."
|
||||||
|
|
||||||
(provide 'erc)
|
(provide 'erc)
|
||||||
|
|
||||||
|
;; FIXME this is a temporary stopgap for Emacs 29.
|
||||||
|
(require 'erc-goodies)
|
||||||
;;; erc.el ends here
|
;;; erc.el ends here
|
||||||
|
|
Loading…
Add table
Reference in a new issue