diff options
| author | Michael Albinus | 2017-12-09 10:13:02 +0100 |
|---|---|---|
| committer | Michael Albinus | 2017-12-09 10:13:02 +0100 |
| commit | 0667d7a160c8110fb0d29e7c2fa6d0cd2ec02cf0 (patch) | |
| tree | e09ac5ca843a5bfa6463f0be1dfadd77650e3d46 /lisp/erc | |
| parent | 198e0d49d82969d103a520fb1266abba64a26de9 (diff) | |
| parent | 5381c70b7a9d46fe4de205363b99f761e2475f1f (diff) | |
| download | emacs-0667d7a160c8110fb0d29e7c2fa6d0cd2ec02cf0.tar.gz 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')
| -rw-r--r-- | lisp/erc/erc.el | 1 |
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." | |||
| 1850 | :get (lambda (sym) | 1850 | :get (lambda (sym) |
| 1851 | ;; replace outdated names with their newer equivalents | 1851 | ;; replace outdated names with their newer equivalents |
| 1852 | (erc-migrate-modules (symbol-value sym))) | 1852 | (erc-migrate-modules (symbol-value sym))) |
| 1853 | :initialize 'custom-initialize-default | ||
| 1853 | :set (lambda (sym val) | 1854 | :set (lambda (sym val) |
| 1854 | ;; disable modules which have just been removed | 1855 | ;; disable modules which have just been removed |
| 1855 | (when (and (boundp 'erc-modules) erc-modules val) | 1856 | (when (and (boundp 'erc-modules) erc-modules val) |