diff options
| author | F. Jason Park | 2024-10-14 19:32:16 -0700 |
|---|---|---|
| committer | F. Jason Park | 2024-11-16 08:17:46 -0800 |
| commit | 6036e0dadf307ebf75e9da16915857e86e8d3340 (patch) | |
| tree | 1ef54d14a8b9d8e9676f149b0f35faa37338eba8 | |
| parent | fc52cb8d74151bcac18d534529517a0a1845ad2e (diff) | |
| download | emacs-6036e0dadf307ebf75e9da16915857e86e8d3340.tar.gz emacs-6036e0dadf307ebf75e9da16915857e86e8d3340.zip | |
Backport: Don't autoload erc-modules
* doc/misc/erc.texi (Modules): Recommend using `describe-variable'
instead of `customize-option' because the latter needs the symbol to be
loaded.
* lisp/erc/erc.el (erc-modules): Remove autoload cookie because it
caused customizations for this option to load the main library. This
reverts the thrust of bb894845 "Teach customize-option about
erc-modules", which was added in ERC 5.6 and Emacs 30. The motivation
for the original offending change was to allow new users to run M-x
customize-option RET erc-modules RET immediately after startup instead
of M-x customize-group RET, followed by an I-search. (Bug#73812)
(Cherry picked from commit 1854f2751e3f73e1e5f12f6de993b6357de1766b)
Do not merge to master.
| -rw-r--r-- | doc/misc/erc.texi | 5 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 1e973d9c434..aa0bc58a8ec 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi | |||
| @@ -411,8 +411,9 @@ Kill current input line using @code{erc-bol} followed by @code{kill-line}. | |||
| 411 | One way to add functionality to ERC is to customize which of its many | 411 | One way to add functionality to ERC is to customize which of its many |
| 412 | modules are loaded. | 412 | modules are loaded. |
| 413 | 413 | ||
| 414 | There is a spiffy customize interface, which may be reached by typing | 414 | You can do this by typing @kbd{C-h v erc-modules @key{RET}} and clicking |
| 415 | @kbd{M-x customize-option @key{RET} erc-modules @key{RET}}. When | 415 | @samp{customize} near the bottom of the resulting help buffer, where it |
| 416 | says ``You can @emph{customize} this variable.'' When | ||
| 416 | removing a module outside of Customize, you may wish to ensure it's | 417 | removing a module outside of Customize, you may wish to ensure it's |
| 417 | disabled by invoking its associated minor-mode toggle with a | 418 | disabled by invoking its associated minor-mode toggle with a |
| 418 | nonpositive prefix argument, for example, @kbd{C-u - M-x | 419 | nonpositive prefix argument, for example, @kbd{C-u - M-x |
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 30641c2bd88..688d2f4b1ae 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -2263,8 +2263,6 @@ buffer rather than a server buffer.") | |||
| 2263 | (cl-pushnew mod (if (get mod 'erc--module) built-in third-party))) | 2263 | (cl-pushnew mod (if (get mod 'erc--module) built-in third-party))) |
| 2264 | `(,@(sort built-in #'string-lessp) ,@(nreverse third-party)))) | 2264 | `(,@(sort built-in #'string-lessp) ,@(nreverse third-party)))) |
| 2265 | 2265 | ||
| 2266 | ;;;###autoload(custom-autoload 'erc-modules "erc") | ||
| 2267 | |||
| 2268 | (defcustom erc-modules '( autojoin button completion fill imenu irccontrols | 2266 | (defcustom erc-modules '( autojoin button completion fill imenu irccontrols |
| 2269 | list match menu move-to-prompt netsplit | 2267 | list match menu move-to-prompt netsplit |
| 2270 | networks readonly ring stamp track) | 2268 | networks readonly ring stamp track) |