diff options
| author | F. Jason Park <jp@neverwas.me> | 2023-01-19 20:19:40 -0800 |
|---|---|---|
| committer | F. Jason Park <jp@neverwas.me> | 2023-01-20 05:09:29 -0800 |
| commit | 628b624176357117f6ff89980a81eff0920cde37 (patch) | |
| tree | bfca8c36517fd90b813ffdfb4a569aeefd7b4575 | |
| parent | 40cf494b7ce8e2ad457d0e6841496239b756f313 (diff) | |
| download | emacs-628b624176357117f6ff89980a81eff0920cde37.tar.gz | |
Don't load erc-goodies atop erc.el
* lisp/erc/erc.el: Commit c2d657e7c4fd9685591f2120007eabf78745919d
"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.
| -rw-r--r-- | lisp/erc/erc.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 7f51b7bfb2e..ff1820cfaf2 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -61,7 +61,6 @@ (load "erc-loaddefs" 'noerror 'nomessage) (require 'erc-networks) -(require 'erc-goodies) (require 'erc-backend) (require 'cl-lib) (require 'format-spec) @@ -7386,4 +7385,6 @@ Customize `erc-url-connect-function' to override this." (provide 'erc) +;; FIXME this is a temporary stopgap for Emacs 29. +(require 'erc-goodies) ;;; erc.el ends here |