aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-12-03 18:54:08 -0800
committerGlenn Morris2017-12-03 18:54:08 -0800
commite9ea2065a82c46b3524633e4638834fc70ae3e6e (patch)
tree7dc0a5284454b513bf1ee76eb24f7e0f6a5381f6
parent4b06af0643d14b4e989a9360444b6ee0768ae99a (diff)
downloademacs-e9ea2065a82c46b3524633e4638834fc70ae3e6e.tar.gz
emacs-e9ea2065a82c46b3524633e4638834fc70ae3e6e.zip
Don't enable erc modules on simply loading erc.el
* lisp/erc/erc.el (erc-modules): Use default :initialize. (Bug#29417)
-rw-r--r--lisp/erc/erc.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 5fe4f9a80a4..d75209a0e28 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1832,6 +1832,7 @@ removed from the list will be disabled."
1832 :get (lambda (sym) 1832 :get (lambda (sym)
1833 ;; replace outdated names with their newer equivalents 1833 ;; replace outdated names with their newer equivalents
1834 (erc-migrate-modules (symbol-value sym))) 1834 (erc-migrate-modules (symbol-value sym)))
1835 :initialize 'custom-initialize-default
1835 :set (lambda (sym val) 1836 :set (lambda (sym val)
1836 ;; disable modules which have just been removed 1837 ;; disable modules which have just been removed
1837 (when (and (boundp 'erc-modules) erc-modules val) 1838 (when (and (boundp 'erc-modules) erc-modules val)