summaryrefslogtreecommitdiff
path: root/lisp/erc/erc.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-12-09 10:13:02 +0100
committerMichael Albinus <michael.albinus@gmx.de>2017-12-09 10:13:02 +0100
commit0667d7a160c8110fb0d29e7c2fa6d0cd2ec02cf0 (patch)
treee09ac5ca843a5bfa6463f0be1dfadd77650e3d46 /lisp/erc/erc.el
parent198e0d49d82969d103a520fb1266abba64a26de9 (diff)
parent5381c70b7a9d46fe4de205363b99f761e2475f1f (diff)
downloademacs-0667d7a160c8110fb0d29e7c2fa6d0cd2ec02cf0.tar.gz
emacs-0667d7a160c8110fb0d29e7c2fa6d0cd2ec02cf0.tar.bz2
emacs-0667d7a160c8110fb0d29e7c2fa6d0cd2ec02cf0.zip
Merge from origin/emacs-26
5381c70b7a In windows.texi mention special splitting behavior of side... 46d62b9f36 * lisp/gnus/gnus-group.el (gnus-group-mode-map): Bind [fol... 1ef1dbdbc5 Avoid compilation warning in xterm.c 5cf3c26f2d * README: Document all the top-level directories. (Bug#29... e9ea2065a8 Don't enable erc modules on simply loading erc.el
Diffstat (limited to 'lisp/erc/erc.el')
-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 eee79464a9a..bda8dc1e714 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1850,6 +1850,7 @@ removed from the list will be disabled."
:get (lambda (sym)
;; replace outdated names with their newer equivalents
(erc-migrate-modules (symbol-value sym)))
+ :initialize 'custom-initialize-default
:set (lambda (sym val)
;; disable modules which have just been removed
(when (and (boundp 'erc-modules) erc-modules val)