summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-netsplit.el
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-01-31 22:34:48 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-01-31 22:34:48 -0700
commitd4d613629b59d2eadd80026cab6c9dabc92cab24 (patch)
treed31086a817251dddb847d027661d218c1ecd6540 /lisp/erc/erc-netsplit.el
parentfdb813e529602914360fc2d0cf22e42e32e6905f (diff)
parenta5438ee11ad052e71334dcfb2db51fb9123411e5 (diff)
downloademacs-d4d613629b59d2eadd80026cab6c9dabc92cab24.tar.gz
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/erc/erc-netsplit.el')
-rw-r--r--lisp/erc/erc-netsplit.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 9fd3cfe1cc4..37fc4cf16c1 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -82,12 +82,11 @@ Args: PROC is the process the netjoin originated from and
:group 'erc-hooks
:type 'hook)
-(defvar erc-netsplit-list nil
+(defvar-local erc-netsplit-list nil
"This is a list of the form
\((\"a.b.c.d e.f.g\" TIMESTAMP FIRST-JOIN \"nick1\" ... \"nickn\") ...)
where FIRST-JOIN is t or nil, depending on whether or not the first
join from that split has been detected or not.")
-(make-variable-buffer-local 'erc-netsplit-list)
(defun erc-netsplit-install-message-catalogs ()
(erc-define-catalog